xfs: rename dquot incore state flags

Source kernel commit: 985a78fdde15e1730383f99867ca38b5648444bf

Rename the existing incore dquot "dq_flags" field to "q_flags" to match
everything else in the structure, then move the two actual dquot state
flags to the XFS_DQFLAG_ namespace from XFS_DQ_.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_quota_defs.h b/libxfs/xfs_quota_defs.h
index b7cda38ef264af1ab70a4ef4caaf494084ccfec1..70ba784d9b0bb36c7295f8ba366786bb2ff17feb 100644 (file)
--- a/libxfs/xfs_quota_defs.h
+++ b/libxfs/xfs_quota_defs.h
@@ -26,17 +26,17 @@ typedef uint16_t    xfs_qwarncnt_t;
 #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_DQ_DIRTY           0x0008          /* dquot is dirty */
-#define XFS_DQ_FREEING         0x0010          /* dquot is being torn down */
+#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_DQ_FLAGS \
+#define XFS_DQFLAG_STRINGS \
        { XFS_DQ_USER,          "USER" }, \
        { XFS_DQ_PROJ,          "PROJ" }, \
        { XFS_DQ_GROUP,         "GROUP" }, \
-       { XFS_DQ_DIRTY,         "DIRTY" }, \
-       { XFS_DQ_FREEING,       "FREEING" }
+       { XFS_DQFLAG_DIRTY,     "DIRTY" }, \
+       { XFS_DQFLAG_FREEING,   "FREEING" }
 
 /*
  * We have the possibility of all three quota types being active at once, and