Commit 149e53af authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: remove the active vs running quota differentiation 



These only made a difference when quotaoff supported disabling quota
accounting on a mounted file system, so we can switch everyone to use
a single set of flags and helpers now. Note that the *QUOTA_ON naming
for the helpers is kept as it was the much more commonly used one.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent e497dfba

fs/xfs/libxfs/xfs_quota_defs.h

+4 −26
Original line number Diff line number Diff line
@@ -60,36 +60,14 @@ typedef uint8_t xfs_dqtype_t; 
#define XFS_DQUOT_LOGRES(mp)	\

	((sizeof(struct xfs_dq_logformat) + sizeof(struct xfs_disk_dquot)) * 6)



#define XFS_IS_QUOTA_RUNNING(mp)	((mp)->m_qflags & XFS_ALL_QUOTA_ACCT)

#define XFS_IS_UQUOTA_RUNNING(mp)	((mp)->m_qflags & XFS_UQUOTA_ACCT)

#define XFS_IS_PQUOTA_RUNNING(mp)	((mp)->m_qflags & XFS_PQUOTA_ACCT)

#define XFS_IS_GQUOTA_RUNNING(mp)	((mp)->m_qflags & XFS_GQUOTA_ACCT)

#define XFS_IS_QUOTA_ON(mp)		((mp)->m_qflags & XFS_ALL_QUOTA_ACCT)

#define XFS_IS_UQUOTA_ON(mp)		((mp)->m_qflags & XFS_UQUOTA_ACCT)

#define XFS_IS_PQUOTA_ON(mp)		((mp)->m_qflags & XFS_PQUOTA_ACCT)

#define XFS_IS_GQUOTA_ON(mp)		((mp)->m_qflags & XFS_GQUOTA_ACCT)

#define XFS_IS_UQUOTA_ENFORCED(mp)	((mp)->m_qflags & XFS_UQUOTA_ENFD)

#define XFS_IS_GQUOTA_ENFORCED(mp)	((mp)->m_qflags & XFS_GQUOTA_ENFD)

#define XFS_IS_PQUOTA_ENFORCED(mp)	((mp)->m_qflags & XFS_PQUOTA_ENFD)



/*

 * Incore only flags for quotaoff - these bits get cleared when quota(s)

 * are in the process of getting turned off. These flags are in m_qflags but

 * never in sb_qflags.

 */

#define XFS_UQUOTA_ACTIVE	0x1000  /* uquotas are being turned off */

#define XFS_GQUOTA_ACTIVE	0x2000  /* gquotas are being turned off */

#define XFS_PQUOTA_ACTIVE	0x4000  /* pquotas are being turned off */

#define XFS_ALL_QUOTA_ACTIVE	\

	(XFS_UQUOTA_ACTIVE | XFS_GQUOTA_ACTIVE | XFS_PQUOTA_ACTIVE)



/*

 * Checking XFS_IS_*QUOTA_ON() while holding any inode lock guarantees

 * quota will be not be switched off as long as that inode lock is held.

 */

#define XFS_IS_QUOTA_ON(mp)	((mp)->m_qflags & (XFS_UQUOTA_ACTIVE | \

						   XFS_GQUOTA_ACTIVE | \

						   XFS_PQUOTA_ACTIVE))

#define XFS_IS_UQUOTA_ON(mp)	((mp)->m_qflags & XFS_UQUOTA_ACTIVE)

#define XFS_IS_GQUOTA_ON(mp)	((mp)->m_qflags & XFS_GQUOTA_ACTIVE)

#define XFS_IS_PQUOTA_ON(mp)	((mp)->m_qflags & XFS_PQUOTA_ACTIVE)



/*

 * Flags to tell various functions what to do. Not all of these are meaningful

 * to a single function. None of these XFS_QMOPT_* flags are meant to have

fs/xfs/scrub/quota.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ xchk_setup_quota( 
	xfs_dqtype_t		dqtype;

	int			error;



	if (!XFS_IS_QUOTA_RUNNING(sc->mp) || !XFS_IS_QUOTA_ON(sc->mp))

	if (!XFS_IS_QUOTA_ON(sc->mp))

		return -ENOENT;



	dqtype = xchk_quota_to_dqtype(sc);

fs/xfs/xfs_dquot.c

+0 −3
Original line number Diff line number Diff line
@@ -847,9 +847,6 @@ xfs_qm_dqget_checks( 
	struct xfs_mount	*mp,

	xfs_dqtype_t		type)

{

	if (WARN_ON_ONCE(!XFS_IS_QUOTA_RUNNING(mp)))

		return -ESRCH;



	switch (type) {

	case XFS_DQTYPE_USER:

		if (!XFS_IS_UQUOTA_ON(mp))

fs/xfs/xfs_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -1450,7 +1450,7 @@ xfs_fileattr_set( 


	/* Change the ownerships and register project quota modifications */

	if (ip->i_projid != fa->fsx_projid) {

		if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_PQUOTA_ON(mp)) {

		if (XFS_IS_PQUOTA_ON(mp)) {

			olddquot = xfs_qm_vop_chown(tp, ip,

						&ip->i_pdquot, pdqp);

		}

fs/xfs/xfs_iops.c

+2 −2
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ xfs_setattr_nonsize( 
		 * in the transaction.

		 */

		if (!uid_eq(iuid, uid)) {

			if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_UQUOTA_ON(mp)) {

			if (XFS_IS_UQUOTA_ON(mp)) {

				ASSERT(mask & ATTR_UID);

				ASSERT(udqp);

				olddquot1 = xfs_qm_vop_chown(tp, ip,
@@ -787,7 +787,7 @@ xfs_setattr_nonsize( 
			inode->i_uid = uid;

		}

		if (!gid_eq(igid, gid)) {

			if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_GQUOTA_ON(mp)) {

			if (XFS_IS_GQUOTA_ON(mp)) {

				ASSERT(xfs_sb_version_has_pquotino(&mp->m_sb) ||

				       !XFS_IS_PQUOTA_ON(mp));

				ASSERT(mask & ATTR_GID);