On Thu, Dec 01, 2016 at 09:54:44AM +1100, Dave Chinner wrote: > From: Dave Chinner <dchinner@xxxxxxxxxx> > > We always perform integrity operations now, so these mount options > don't do anything. Deprecate them and mark them for removal in > in a year. > > Signed-Off-By: Dave Chinner <dchinner@xxxxxxxxxx> > --- > Documentation/filesystems/xfs.txt | 12 ++++-------- > fs/xfs/xfs_super.c | 25 ++++++++++++++++--------- > 2 files changed, 20 insertions(+), 17 deletions(-) > ... > diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c > index 563d1d146b8c..eecbaac08eba 100644 > --- a/fs/xfs/xfs_super.c > +++ b/fs/xfs/xfs_super.c ... > @@ -374,6 +371,14 @@ xfs_parseargs( > mp->m_flags |= XFS_MOUNT_DAX; > break; > #endif > + case Opt_barrier: > + xfs_warn(mp, "%s option is deprecated, ignoring.", p); > + mp->m_flags |= XFS_MOUNT_BARRIER; > + break; > + case Opt_nobarrier: > + xfs_warn(mp, "%s option is deprecated, ignoring.", p); > + mp->m_flags &= ~XFS_MOUNT_BARRIER; > + break; So basically XFS_MOUNT_BARRIER exists solely for the purpose of showargs. Should we just kill it too and do something deterministic on showargs (i.e., always show 'barrier' or just drop it entirely), or does precedent suggest otherwise? That aside, this all seems Ok to me. Brian > default: > xfs_warn(mp, "unknown mount option [%s].", p); > return -EINVAL; > @@ -1238,9 +1243,11 @@ xfs_fs_remount( > token = match_token(p, tokens, args); > switch (token) { > case Opt_barrier: > + xfs_warn(mp, "%s option is deprecated, ignoring.", p); > mp->m_flags |= XFS_MOUNT_BARRIER; > break; > case Opt_nobarrier: > + xfs_warn(mp, "%s option is deprecated, ignoring.", p); > mp->m_flags &= ~XFS_MOUNT_BARRIER; > break; > case Opt_inode64: > -- > 2.10.2 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html