fs/xfs: Change XFS_MOUNT_DAX to XFS_MOUNT_DAX_ALWAYS

In prep for the new tri-state mount option which then introduces
XFS_MOUNT_DAX_NEVER.

Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index f7a99b3bbcf7a37e4ce4fba965b2c53a424c9b0a..462f89af479a7ab9cba051b9063ef6cffee42933 100644 (file)
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -1248,7 +1248,7 @@ xfs_inode_supports_dax(
                return false;
 
        /* DAX mount option or DAX iflag must be set. */
-       if (!(mp->m_flags & XFS_MOUNT_DAX) &&
+       if (!(mp->m_flags & XFS_MOUNT_DAX_ALWAYS) &&
            !(ip->i_d.di_flags2 & XFS_DIFLAG2_DAX))
                return false;
 

diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index b2e4598fdf7d3e17e1dba5ac4d48cb10f07ec05f..f6123fb0113c685b51770cf4eb3f000918c7c269 100644 (file)
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -237,8 +237,7 @@ typedef struct xfs_mount {
 #define XFS_MOUNT_FILESTREAMS  (1ULL << 24)    /* enable the filestreams
                                                   allocator */
 #define XFS_MOUNT_NOATTR2      (1ULL << 25)    /* disable use of attr2 format */
-
-#define XFS_MOUNT_DAX          (1ULL << 62)    /* TEST ONLY! */
+#define XFS_MOUNT_DAX_ALWAYS   (1ULL << 26)
 
 /*
  * Max and min values for mount-option defined I/O

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index a7f8e387ebfefc1719b6dd940a519bf51ce1e8b9..51fdef91edda535fdb469842473cff1e69397180 100644 (file)
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -129,7 +129,7 @@ xfs_fs_show_options(
                { XFS_MOUNT_GRPID,              ",grpid" },
                { XFS_MOUNT_DISCARD,            ",discard" },
                { XFS_MOUNT_LARGEIO,            ",largeio" },
-               { XFS_MOUNT_DAX,                ",dax" },
+               { XFS_MOUNT_DAX_ALWAYS,         ",dax" },
                { 0, NULL }
        };
        struct xfs_mount        *mp = XFS_M(root->d_sb);
@@ -1261,7 +1261,7 @@ xfs_fc_parse_param(
                return 0;
 #ifdef CONFIG_FS_DAX
        case Opt_dax:
-               mp->m_flags |= XFS_MOUNT_DAX;
+               mp->m_flags |= XFS_MOUNT_DAX_ALWAYS;
                return 0;
 #endif
        default:
@@ -1454,7 +1454,7 @@ xfs_fc_fill_super(
        if (XFS_SB_VERSION_NUM(&mp->m_sb) == XFS_SB_VERSION_5)
                sb->s_flags |= SB_I_VERSION;
 
-       if (mp->m_flags & XFS_MOUNT_DAX) {
+       if (mp->m_flags & XFS_MOUNT_DAX_ALWAYS) {
                bool rtdev_is_dax = false, datadev_is_dax;
 
                xfs_warn(mp,
@@ -1468,7 +1468,7 @@ xfs_fc_fill_super(
                if (!rtdev_is_dax && !datadev_is_dax) {
                        xfs_alert(mp,
                        "DAX unsupported by block device. Turning off DAX.");
-                       mp->m_flags &= ~XFS_MOUNT_DAX;
+                       mp->m_flags &= ~XFS_MOUNT_DAX_ALWAYS;
                }
                if (xfs_sb_version_hasreflink(&mp->m_sb)) {
                        xfs_alert(mp,