From: Darrick J. Wong Date: Fri, 4 Sep 2020 20:06:20 +0000 (-0400) Subject: xfs: rename XFS_DQ_{USER,GROUP,PROJ} to XFS_DQTYPE_* X-Git-Tag: v5.9.0-rc0~36 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e4128a7f000347c7d33afbcd8520dbe126f2123;p=thirdparty%2Fxfsprogs-dev.git xfs: rename XFS_DQ_{USER,GROUP,PROJ} to XFS_DQTYPE_* Source kernel commit: 8cd4901da56caadc16b4e8d6b434291a8ce31d7c 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: Darrick J. Wong Reviewed-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Eric Sandeen --- diff --git a/db/check.c b/db/check.c index ef0e82d4e..9f15f892a 100644 --- a/db/check.c +++ b/db/check.c @@ -3447,15 +3447,15 @@ process_quota( switch (qtype) { case IS_USER_QUOTA: s = "user"; - exp_flags = XFS_DQ_USER; + exp_flags = XFS_DQTYPE_USER; break; case IS_PROJECT_QUOTA: s = "project"; - exp_flags = XFS_DQ_PROJ; + exp_flags = XFS_DQTYPE_PROJ; break; case IS_GROUP_QUOTA: s = "group"; - exp_flags = XFS_DQ_GROUP; + exp_flags = XFS_DQTYPE_GROUP; break; default: ASSERT(0); diff --git a/libxfs/xfs_dquot_buf.c b/libxfs/xfs_dquot_buf.c index 097ed195a..2f881df5d 100644 --- a/libxfs/xfs_dquot_buf.c +++ b/libxfs/xfs_dquot_buf.c @@ -57,9 +57,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)) diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h index 32e46ee40..0c56c70e2 100644 --- a/libxfs/xfs_format.h +++ b/libxfs/xfs_format.h @@ -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 */ diff --git a/libxfs/xfs_quota_defs.h b/libxfs/xfs_quota_defs.h index d2245f375..baf6c4ad8 100644 --- a/libxfs/xfs_quota_defs.h +++ b/libxfs/xfs_quota_defs.h @@ -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" } diff --git a/repair/dinode.c b/repair/dinode.c index 8cd84bc27..d2ec0010d 100644 --- a/repair/dinode.c +++ b/repair/dinode.c @@ -1065,15 +1065,15 @@ process_quota_inode( switch (ino_type) { case XR_INO_UQUOTA: - quota_type = XFS_DQ_USER; + quota_type = XFS_DQTYPE_USER; quota_string = _("User quota"); break; case XR_INO_GQUOTA: - quota_type = XFS_DQ_GROUP; + quota_type = XFS_DQTYPE_GROUP; quota_string = _("Group quota"); break; case XR_INO_PQUOTA: - quota_type = XFS_DQ_PROJ; + quota_type = XFS_DQTYPE_PROJ; quota_string = _("Project quota"); break; default: @@ -1128,7 +1128,7 @@ _("cannot read inode %" PRIu64 ", file block %" PRIu64 ", disk block %" PRIu64 " } if (libxfs_dquot_verify(mp, &dqb->dd_diskdq, dqid) != NULL || - (dqb->dd_diskdq.d_flags & XFS_DQ_ALLTYPES) + (dqb->dd_diskdq.d_flags & XFS_DQTYPE_REC_MASK) != quota_type) { do_warn(_("%s: Corrupt quota for id %u. "), quota_string, dqid); diff --git a/repair/phase7.c b/repair/phase7.c index 30cb46f9a..e410db1cb 100644 --- a/repair/phase7.c +++ b/repair/phase7.c @@ -148,9 +148,9 @@ phase7( destroy_work_queue(&wq); - quotacheck_verify(mp, XFS_DQ_USER); - quotacheck_verify(mp, XFS_DQ_GROUP); - quotacheck_verify(mp, XFS_DQ_PROJ); + quotacheck_verify(mp, XFS_DQTYPE_USER); + quotacheck_verify(mp, XFS_DQTYPE_GROUP); + quotacheck_verify(mp, XFS_DQTYPE_PROJ); quotacheck_teardown(); diff --git a/repair/quotacheck.c b/repair/quotacheck.c index 87f81c3d2..a115806fe 100644 --- a/repair/quotacheck.c +++ b/repair/quotacheck.c @@ -39,7 +39,7 @@ struct qc_dquots { pthread_mutex_t lock; struct avl64tree_desc tree; - /* One of XFS_DQ_{USER,GROUP,PROJ} */ + /* One of XFS_DQTYPE_USER/PROJ/GROUP */ uint16_t type; }; @@ -70,11 +70,11 @@ static const char * qflags_typestr( unsigned int type) { - if (type & XFS_DQ_USER) + if (type & XFS_DQTYPE_USER) return _("user quota"); - else if (type & XFS_DQ_GROUP) + else if (type & XFS_DQTYPE_GROUP) return _("group quota"); - else if (type & XFS_DQ_PROJ) + else if (type & XFS_DQTYPE_PROJ) return _("project quota"); return NULL; } @@ -345,15 +345,15 @@ quotacheck_verify( int error; switch (type) { - case XFS_DQ_USER: + case XFS_DQTYPE_USER: ino = mp->m_sb.sb_uquotino; dquots = user_dquots; break; - case XFS_DQ_GROUP: + case XFS_DQTYPE_GROUP: ino = mp->m_sb.sb_gquotino; dquots = group_dquots; break; - case XFS_DQ_PROJ: + case XFS_DQTYPE_PROJ: ino = mp->m_sb.sb_pquotino; dquots = proj_dquots; break; @@ -434,17 +434,17 @@ qc_has_quotafile( unsigned int qflag; switch (type) { - case XFS_DQ_USER: + case XFS_DQTYPE_USER: lost = lost_uquotino; ino = mp->m_sb.sb_uquotino; qflag = XFS_UQUOTA_CHKD; break; - case XFS_DQ_GROUP: + case XFS_DQTYPE_GROUP: lost = lost_gquotino; ino = mp->m_sb.sb_gquotino; qflag = XFS_GQUOTA_CHKD; break; - case XFS_DQ_PROJ: + case XFS_DQTYPE_PROJ: lost = lost_pquotino; ino = mp->m_sb.sb_pquotino; qflag = XFS_PQUOTA_CHKD; @@ -493,22 +493,22 @@ quotacheck_setup( if (!fs_quotas || lost_quotas || noquota) return 0; - if (qc_has_quotafile(mp, XFS_DQ_USER)) { - user_dquots = qc_dquots_init(XFS_DQ_USER); + if (qc_has_quotafile(mp, XFS_DQTYPE_USER)) { + user_dquots = qc_dquots_init(XFS_DQTYPE_USER); if (!user_dquots) goto err; chkd_flags |= XFS_UQUOTA_CHKD; } - if (qc_has_quotafile(mp, XFS_DQ_GROUP)) { - group_dquots = qc_dquots_init(XFS_DQ_GROUP); + if (qc_has_quotafile(mp, XFS_DQTYPE_GROUP)) { + group_dquots = qc_dquots_init(XFS_DQTYPE_GROUP); if (!group_dquots) goto err; chkd_flags |= XFS_GQUOTA_CHKD; } - if (qc_has_quotafile(mp, XFS_DQ_PROJ)) { - proj_dquots = qc_dquots_init(XFS_DQ_PROJ); + if (qc_has_quotafile(mp, XFS_DQTYPE_PROJ)) { + proj_dquots = qc_dquots_init(XFS_DQTYPE_PROJ); if (!proj_dquots) goto err; chkd_flags |= XFS_PQUOTA_CHKD;