xfs: rename the ondisk dquot d_flags to d_type

Source kernel commit: d8c1af0d6ad617df4563e78bbee70691f25ace58

The ondisk dquot stores the quota record type in the flags field.
Rename this field to d_type to make the _type relationship between the
ondisk and incore dquot more obvious.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/db/check.c b/db/check.c
index 7b81c74fec7f74f2e9daae1362b3c934dffd0b61..553249dc9a41e068ff92c2d445fce48cb676a8a8 100644 (file)
--- a/db/check.c
+++ b/db/check.c
@@ -3436,7 +3436,7 @@ process_quota(
        int             cb;
        xfs_dqblk_t     *dqb;
        xfs_dqid_t      dqid;
-       xfs_dqtype_t    exp_flags = 0;
+       uint8_t         exp_flags = 0;
        uint            i;
        uint            perblock;
        xfs_fileoff_t   qbno;
@@ -3509,21 +3509,21 @@ process_quota(
                                error++;
                                continue;
                        }
-                       if (dqb->dd_diskdq.d_flags & ~XFS_DQTYPE_ANY) {
+                       if (dqb->dd_diskdq.d_type & ~XFS_DQTYPE_ANY) {
                                if (scicb)
                                        dbprintf(_("bad flags %#x for %s dqblk "
                                                 "%lld entry %d id %u\n"),
-                                               dqb->dd_diskdq.d_flags, s,
+                                               dqb->dd_diskdq.d_type, s,
                                                (xfs_fileoff_t)qbno, i, dqid);
                                error++;
                                continue;
                        }
-                       if ((dqb->dd_diskdq.d_flags & XFS_DQTYPE_REC_MASK)
+                       if ((dqb->dd_diskdq.d_type & XFS_DQTYPE_REC_MASK)
                                                                != exp_flags) {
                                if (scicb)
                                        dbprintf(_("wrong type %#x for %s dqblk "
                                                 "%lld entry %d id %u\n"),
-                                               dqb->dd_diskdq.d_flags &
+                                               dqb->dd_diskdq.d_type &
                                                        XFS_DQTYPE_REC_MASK, s,
                                                (xfs_fileoff_t)qbno, i, dqid);
                                error++;

diff --git a/db/dquot.c b/db/dquot.c
index 8e91b4a07a175eefd4c80da30952631dbc1ea91e..1392aa1673ae07ada372d3577648cf2c9ac1cb0d 100644 (file)
--- a/db/dquot.c
+++ b/db/dquot.c
@@ -48,7 +48,7 @@ const field_t dqblk_flds[] = {
 const field_t  disk_dquot_flds[] = {
        { "magic", FLDT_UINT16X, OI(DOFF(magic)), C1, 0, TYP_NONE },
        { "version", FLDT_UINT8X, OI(DOFF(version)), C1, 0, TYP_NONE },
-       { "flags", FLDT_UINT8X, OI(DOFF(flags)), C1, 0, TYP_NONE },
+       { "type", FLDT_UINT8X, OI(DOFF(type)), C1, 0, TYP_NONE },
        { "id", FLDT_DQID, OI(DOFF(id)), C1, 0, TYP_NONE },
        { "blk_hardlimit", FLDT_QCNT, OI(DOFF(blk_hardlimit)), C1, 0,
          TYP_NONE },

diff --git a/libxfs/xfs_dquot_buf.c b/libxfs/xfs_dquot_buf.c
index 11ae9ffad393577094b502bec9501a8b682040bc..b5adb840d015b2763784eb10cfefa37e755c1665 100644 (file)
--- a/libxfs/xfs_dquot_buf.c
+++ b/libxfs/xfs_dquot_buf.c
@@ -59,9 +59,9 @@ xfs_dquot_verify(
        if (ddq->d_version != XFS_DQUOT_VERSION)
                return __this_address;
 
-       if (ddq->d_flags & ~XFS_DQTYPE_ANY)
+       if (ddq->d_type & ~XFS_DQTYPE_ANY)
                return __this_address;
-       ddq_type = ddq->d_flags & XFS_DQTYPE_REC_MASK;
+       ddq_type = ddq->d_type & XFS_DQTYPE_REC_MASK;
        if (ddq_type != XFS_DQTYPE_USER &&
            ddq_type != XFS_DQTYPE_PROJ &&
            ddq_type != XFS_DQTYPE_GROUP)
@@ -122,7 +122,7 @@ xfs_dqblk_repair(
 
        dqb->dd_diskdq.d_magic = cpu_to_be16(XFS_DQUOT_MAGIC);
        dqb->dd_diskdq.d_version = XFS_DQUOT_VERSION;
-       dqb->dd_diskdq.d_flags = type;
+       dqb->dd_diskdq.d_type = type;
        dqb->dd_diskdq.d_id = cpu_to_be32(id);
 
        if (xfs_sb_version_hascrc(&mp->m_sb)) {

diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h
index bd0d933039c3aa4287ccb6ea230ffa0f550d799f..f0ecd064ff1479f88f8ca05c61a8a32c2e3f0d78 100644 (file)
--- a/libxfs/xfs_format.h
+++ b/libxfs/xfs_format.h
@@ -1168,7 +1168,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_DQTYPE_USER/PROJ/GROUP */
+       __u8            d_type;         /* 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/logprint/log_misc.c b/logprint/log_misc.c
index be88988778e5d63b613ece4e9363b03c6cc061d1..af927cbfa79217292e94adf4c67c8f954ca193f7 100644 (file)
--- a/logprint/log_misc.c
+++ b/logprint/log_misc.c
@@ -369,7 +369,7 @@ xlog_print_trans_buffer(char **ptr, int len, int *i, int num_ops)
                else {
                        printf("\n");
                        printf(_("ver: %d  flags: 0x%x  id: %d  \n"),
-                               dq->d_version, dq->d_flags,
+                               dq->d_version, dq->d_type,
                                be32_to_cpu(dq->d_id));
                        printf(_("blk limits  hard: %llu  soft: %llu\n"),
                               (unsigned long long)
@@ -695,7 +695,7 @@ xlog_print_trans_dquot(char **ptr, int len, int *i, int num_ops)
        ASSERT(be32_to_cpu(head->oh_len) == sizeof(struct xfs_disk_dquot));
        memmove(&ddq, *ptr, sizeof(struct xfs_disk_dquot));
        printf(_("DQUOT: magic 0x%hx flags 0%ho\n"),
-              be16_to_cpu(ddq.d_magic), ddq.d_flags);
+              be16_to_cpu(ddq.d_magic), ddq.d_type);
        *ptr += be32_to_cpu(head->oh_len);
     }
     if (head && head->oh_flags & XLOG_CONTINUE_TRANS)

diff --git a/repair/dinode.c b/repair/dinode.c
index d2ec0010d9b1c3213300d204856d9c042c96cf37..716a77466ee438b38f92de7e17bf2009aa0db919 100644 (file)
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -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_DQTYPE_REC_MASK)
+                           (dqb->dd_diskdq.d_type & XFS_DQTYPE_REC_MASK)
                                                != quota_type) {
                                do_warn(_("%s: Corrupt quota for id %u. "),
                                                quota_string, dqid);