Commit 8cd4901d authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: rename XFS_DQ_{USER,GROUP,PROJ} to XFS_DQTYPE_* 



We're going to split up the incore dquot state flags from the ondisk
dquot flags (eventually renaming this "type") so start by renaming the
three flags and the bitmask that are going to participate in this.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent f9751c4a

fs/xfs/libxfs/xfs_dquot_buf.c

+3 −3
Original line number Diff line number Diff line
@@ -59,9 +59,9 @@ xfs_dquot_verify( 
	if (ddq->d_version != XFS_DQUOT_VERSION)

		return __this_address;



	if (ddq->d_flags != XFS_DQ_USER &&

	    ddq->d_flags != XFS_DQ_PROJ &&

	    ddq->d_flags != XFS_DQ_GROUP)

	if (ddq->d_flags != XFS_DQTYPE_USER &&

	    ddq->d_flags != XFS_DQTYPE_PROJ &&

	    ddq->d_flags != XFS_DQTYPE_GROUP)

		return __this_address;



	if (id != -1 && id != be32_to_cpu(ddq->d_id))

fs/xfs/libxfs/xfs_format.h

+1 −1
Original line number Diff line number Diff line
@@ -1157,7 +1157,7 @@ static inline void xfs_dinode_put_rdev(struct xfs_dinode *dip, xfs_dev_t rdev) 
struct xfs_disk_dquot {

	__be16		d_magic;	/* dquot magic = XFS_DQUOT_MAGIC */

	__u8		d_version;	/* dquot version */

	__u8		d_flags;	/* XFS_DQ_USER/PROJ/GROUP */

	__u8		d_flags;	/* XFS_DQTYPE_USER/PROJ/GROUP */

	__be32		d_id;		/* user,project,group id */

	__be64		d_blk_hardlimit;/* absolute limit on disk blks */

	__be64		d_blk_softlimit;/* preferred limit on disk blks */

fs/xfs/libxfs/xfs_quota_defs.h

+9 −7
Original line number Diff line number Diff line
@@ -21,18 +21,20 @@ typedef uint16_t xfs_qwarncnt_t; 
/*

 * flags for q_flags field in the dquot.

 */

#define XFS_DQ_USER		0x0001		/* a user quota */

#define XFS_DQ_PROJ		0x0002		/* project quota */

#define XFS_DQ_GROUP		0x0004		/* a group quota */

#define XFS_DQTYPE_USER		0x0001		/* a user quota */

#define XFS_DQTYPE_PROJ		0x0002		/* project quota */

#define XFS_DQTYPE_GROUP	0x0004		/* a group quota */

#define XFS_DQFLAG_DIRTY	0x0008		/* dquot is dirty */

#define XFS_DQFLAG_FREEING	0x0010		/* dquot is being torn down */



#define XFS_DQ_ALLTYPES		(XFS_DQ_USER|XFS_DQ_PROJ|XFS_DQ_GROUP)

#define XFS_DQTYPE_REC_MASK	(XFS_DQTYPE_USER | \

				 XFS_DQTYPE_PROJ | \

				 XFS_DQTYPE_GROUP)



#define XFS_DQFLAG_STRINGS \

	{ XFS_DQ_USER,		"USER" }, \

	{ XFS_DQ_PROJ,		"PROJ" }, \

	{ XFS_DQ_GROUP,		"GROUP" }, \

	{ XFS_DQTYPE_USER,	"USER" }, \

	{ XFS_DQTYPE_PROJ,	"PROJ" }, \

	{ XFS_DQTYPE_GROUP,	"GROUP" }, \

	{ XFS_DQFLAG_DIRTY,	"DIRTY" }, \

	{ XFS_DQFLAG_FREEING,	"FREEING" }

fs/xfs/scrub/quota.c

+3 −3
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ xchk_quota_to_dqtype( 
{

	switch (sc->sm->sm_type) {

	case XFS_SCRUB_TYPE_UQUOTA:

		return XFS_DQ_USER;

		return XFS_DQTYPE_USER;

	case XFS_SCRUB_TYPE_GQUOTA:

		return XFS_DQ_GROUP;

		return XFS_DQTYPE_GROUP;

	case XFS_SCRUB_TYPE_PQUOTA:

		return XFS_DQ_PROJ;

		return XFS_DQTYPE_PROJ;

	default:

		return 0;

	}

fs/xfs/scrub/repair.c

+3 −3
Original line number Diff line number Diff line
@@ -939,11 +939,11 @@ xrep_ino_dqattach( 
"inode %llu repair encountered quota error %d, quotacheck forced.",

				(unsigned long long)sc->ip->i_ino, error);

		if (XFS_IS_UQUOTA_ON(sc->mp) && !sc->ip->i_udquot)

			xrep_force_quotacheck(sc, XFS_DQ_USER);

			xrep_force_quotacheck(sc, XFS_DQTYPE_USER);

		if (XFS_IS_GQUOTA_ON(sc->mp) && !sc->ip->i_gdquot)

			xrep_force_quotacheck(sc, XFS_DQ_GROUP);

			xrep_force_quotacheck(sc, XFS_DQTYPE_GROUP);

		if (XFS_IS_PQUOTA_ON(sc->mp) && !sc->ip->i_pdquot)

			xrep_force_quotacheck(sc, XFS_DQ_PROJ);

			xrep_force_quotacheck(sc, XFS_DQTYPE_PROJ);

		/* fall through */

	case -ESRCH:

		error = 0;