lkml.org 
[lkml]   [2020]   [Apr]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH V8 04/11] fs/xfs: Change XFS_MOUNT_DAX to XFS_MOUNT_DAX_ALWAYS
    On Tue, Apr 14, 2020 at 11:45:16PM -0700, ira.weiny@intel.com wrote:
    > From: Ira Weiny <ira.weiny@intel.com>
    >
    > In prep for the new tri-state mount option which then introduces
    > XFS_MOUNT_DAX_NEVER.
    >
    > Signed-off-by: Ira Weiny <ira.weiny@intel.com>

    Looks straightforward,
    Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

    --D

    > ---
    > fs/xfs/xfs_iops.c | 2 +-
    > fs/xfs/xfs_mount.h | 2 +-
    > fs/xfs/xfs_super.c | 8 ++++----
    > 3 files changed, 6 insertions(+), 6 deletions(-)
    >
    > diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
    > index 81f2f93caec0..a6e634631da8 100644
    > --- 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 88ab09ed29e7..54bd74088936 100644
    > --- a/fs/xfs/xfs_mount.h
    > +++ b/fs/xfs/xfs_mount.h
    > @@ -233,7 +233,7 @@ typedef struct xfs_mount {
    > 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 << 62) /* TEST ONLY! */
    >
    > /*
    > * 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 2094386af8ac..3863f41757d2 100644
    > --- 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);
    > @@ -1244,7 +1244,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:
    > @@ -1437,7 +1437,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,
    > @@ -1451,7 +1451,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,
    > --
    > 2.25.1
    >

    \
     
     \ /
      Last update: 2020-04-15 17:12    [W:4.336 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site