summaryrefslogtreecommitdiffstats
path: root/fs/xfs/libxfs/xfs_format.h
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2016-01-19 08:16:08 +1100
committerDave Chinner <david@fromorbit.com>2016-01-19 08:16:08 +1100
commit4c931f770d327f4851917828a1682d030b53d021 (patch)
treec7b98ca2dacf3b39e4233e96002ca80b6833017a /fs/xfs/libxfs/xfs_format.h
parentdde7f55bd000696acc38296c21241971e1840142 (diff)
parent58f88ca2df7270881de2034c8286233a89efe71c (diff)
downloadlinux-4c931f770d327f4851917828a1682d030b53d021.tar.gz
linux-4c931f770d327f4851917828a1682d030b53d021.tar.bz2
linux-4c931f770d327f4851917828a1682d030b53d021.zip
Merge branch 'xfs-setxattr-promotion' into for-next
Diffstat (limited to 'fs/xfs/libxfs/xfs_format.h')
-rw-r--r--fs/xfs/libxfs/xfs_format.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
index e2536bb1c760..dc97eb21af07 100644
--- a/fs/xfs/libxfs/xfs_format.h
+++ b/fs/xfs/libxfs/xfs_format.h
@@ -984,8 +984,6 @@ static inline void xfs_dinode_put_rdev(struct xfs_dinode *dip, xfs_dev_t rdev)
/*
* Values for di_flags
- * There should be a one-to-one correspondence between these flags and the
- * XFS_XFLAG_s.
*/
#define XFS_DIFLAG_REALTIME_BIT 0 /* file's blocks come from rt area */
#define XFS_DIFLAG_PREALLOC_BIT 1 /* file space has been preallocated */
@@ -1026,6 +1024,15 @@ static inline void xfs_dinode_put_rdev(struct xfs_dinode *dip, xfs_dev_t rdev)
XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG | XFS_DIFLAG_FILESTREAM)
/*
+ * Values for di_flags2 These start by being exposed to userspace in the upper
+ * 16 bits of the XFS_XFLAG_s range.
+ */
+#define XFS_DIFLAG2_DAX_BIT 0 /* use DAX for this inode */
+#define XFS_DIFLAG2_DAX (1 << XFS_DIFLAG2_DAX_BIT)
+
+#define XFS_DIFLAG2_ANY (XFS_DIFLAG2_DAX)
+
+/*
* Inode number format:
* low inopblog bits - offset in block
* next agblklog bits - block number in ag