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

Commit 53aa7915 authored by David Chinner's avatar David Chinner Committed by Lachlan McIlroy
Browse files

[XFS] Clean up quotamount error handling. 



xfs_qm_mount_quotas() returns an error status that is ignored. If we fail
to mount quotas, we continue with quota's turned off, which is all handled
inside xfs_qm_mount_quotas(). Mark it as void to indicate that errors need
not be returned to the callers.

SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30788a

Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarNiv Sardi <xaiki@sgi.com>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent 3c56836f

fs/xfs/quota/xfs_qm.c

+14 −14
Original line number Diff line number Diff line
@@ -304,8 +304,11 @@ xfs_qm_unmount_quotadestroy( 
 * necessary data structures like quotainfo.  This is also responsible for

 * running a quotacheck as necessary.  We are guaranteed that the superblock

 * is consistently read in at this point.

 *

 * If we fail here, the mount will continue with quota turned off. We don't

 * need to inidicate success or failure at all.

 */

int

void

xfs_qm_mount_quotas(

	xfs_mount_t	*mp,

	int		mfsi_flags)
@@ -313,7 +316,6 @@ xfs_qm_mount_quotas( 
	int		error = 0;

	uint		sbf;





	/*

	 * If quotas on realtime volumes is not supported, we disable

	 * quotas immediately.
@@ -332,7 +334,8 @@ xfs_qm_mount_quotas( 
	 * Allocate the quotainfo structure inside the mount struct, and

	 * create quotainode(s), and change/rev superblock if necessary.

	 */

	if ((error = xfs_qm_init_quotainfo(mp))) {

	error = xfs_qm_init_quotainfo(mp);

	if (error) {

		/*

		 * We must turn off quotas.

		 */
@@ -345,11 +348,10 @@ xfs_qm_mount_quotas( 
	 */

	if (XFS_QM_NEED_QUOTACHECK(mp) &&

	    !(mfsi_flags & XFS_MFSI_NO_QUOTACHECK)) {

		if ((error = xfs_qm_quotacheck(mp))) {

			/* Quotacheck has failed and quotas have

			 * been disabled.

			 */

			return XFS_ERROR(error);

		error = xfs_qm_quotacheck(mp);

		if (error) {

			/* Quotacheck failed and disabled quotas. */

			return;

		}

	}

	/*
@@ -357,12 +359,10 @@ xfs_qm_mount_quotas( 
	 * quotachecked status, since we won't be doing accounting for

	 * that type anymore.

	 */

	if (!XFS_IS_UQUOTA_ON(mp)) {

	if (!XFS_IS_UQUOTA_ON(mp))

		mp->m_qflags &= ~XFS_UQUOTA_CHKD;

	}

	if (!(XFS_IS_GQUOTA_ON(mp) || XFS_IS_PQUOTA_ON(mp))) {

	if (!(XFS_IS_GQUOTA_ON(mp) || XFS_IS_PQUOTA_ON(mp)))

		mp->m_qflags &= ~XFS_OQUOTA_CHKD;

	}



 write_changes:

	/*
@@ -392,7 +392,7 @@ xfs_qm_mount_quotas( 
		xfs_fs_cmn_err(CE_WARN, mp,

			"Failed to initialize disk quotas.");

	}

	return XFS_ERROR(error);

	return;

}



/*

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 int		xfs_qm_mount_quotas(xfs_mount_t *, int);

extern void		xfs_qm_mount_quotas(xfs_mount_t *, int);

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 *);