Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4249023a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Lachlan McIlroy
Browse files

[XFS] cleanup xfs_mountfs 



Remove all the useless flags and code keyed off it in xfs_mountfs.

SGI-PV: 981498

SGI-Modid: xfs-linux-melb:xfs-kern:31831a

Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent 77508ec8

fs/xfs/linux-2.6/xfs_super.c

+1 −1
Original line number Diff line number Diff line
@@ -1722,7 +1722,7 @@ xfs_fs_fill_super( 
	if (error)

		goto out_free_sb;



	error = xfs_mountfs(mp, flags);

	error = xfs_mountfs(mp);

	if (error)

		goto out_filestream_unmount;

fs/xfs/quota/xfs_qm.c

+2 −4
Original line number Diff line number Diff line
@@ -310,8 +310,7 @@ xfs_qm_unmount_quotadestroy( 
 */

void

xfs_qm_mount_quotas(

	xfs_mount_t	*mp,

	int		mfsi_flags)

	xfs_mount_t	*mp)

{

	int		error = 0;

	uint		sbf;
@@ -346,8 +345,7 @@ xfs_qm_mount_quotas( 
	/*

	 * If any of the quotas are not consistent, do a quotacheck.

	 */

	if (XFS_QM_NEED_QUOTACHECK(mp) &&

	    !(mfsi_flags & XFS_MFSI_NO_QUOTACHECK)) {

	if (XFS_QM_NEED_QUOTACHECK(mp)) {

		error = xfs_qm_quotacheck(mp);

		if (error) {

			/* Quotacheck failed and disabled quotas. */

fs/xfs/quota/xfs_qm.h

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ typedef struct xfs_dquot_acct { 
#define XFS_QM_RELE(xqm)	((xqm)->qm_nrefs--)



extern void		xfs_qm_destroy_quotainfo(xfs_mount_t *);

extern void		xfs_qm_mount_quotas(xfs_mount_t *, int);

extern void		xfs_qm_mount_quotas(xfs_mount_t *);

extern int		xfs_qm_quotacheck(xfs_mount_t *);

extern void		xfs_qm_unmount_quotadestroy(xfs_mount_t *);

extern int		xfs_qm_unmount_quotas(xfs_mount_t *);

fs/xfs/quota/xfs_qm_bhv.c

+3 −4
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ xfs_qm_newmount( 
			 * mounting, and get on with the boring life

			 * without disk quotas.

			 */

			xfs_qm_mount_quotas(mp, 0);

			xfs_qm_mount_quotas(mp);

		} else {

			/*

			 * Clear the quota flags, but remember them. This
@@ -184,13 +184,12 @@ STATIC int 
xfs_qm_endmount(

	xfs_mount_t	*mp,

	uint		needquotamount,

	uint		quotaflags,

	int		mfsi_flags)

	uint		quotaflags)

{

	if (needquotamount) {

		ASSERT(mp->m_qflags == 0);

		mp->m_qflags = quotaflags;

		xfs_qm_mount_quotas(mp, mfsi_flags);

		xfs_qm_mount_quotas(mp);

	}



#if defined(DEBUG) && defined(XFS_LOUD_RECOVERY)

fs/xfs/xfs_log.c

+2 −2
Original line number Diff line number Diff line
@@ -588,12 +588,12 @@ xfs_log_mount( 
 * mp		- ubiquitous xfs mount point structure

 */

int

xfs_log_mount_finish(xfs_mount_t *mp, int mfsi_flags)

xfs_log_mount_finish(xfs_mount_t *mp)

{

	int	error;



	if (!(mp->m_flags & XFS_MOUNT_NORECOVERY))

		error = xlog_recover_finish(mp->m_log, mfsi_flags);

		error = xlog_recover_finish(mp->m_log);

	else {

		error = 0;

		ASSERT(mp->m_flags & XFS_MOUNT_RDONLY);