On Wed, Jan 31, 2018 at 02:23:24PM -0800, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@xxxxxxxxxx> > > Now that reflink is no longer experimental, reject attempts to mount > with DAX until that whole mess gets sorted out. > > Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> nit: Check alignment of the warning message (probably ok?)... Reviewed-by: Bill O'Donnell <billodo@xxxxxxxxxx> > --- > fs/xfs/xfs_super.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c > index f436eec..fd34cf2 100644 > --- a/fs/xfs/xfs_super.c > +++ b/fs/xfs/xfs_super.c > @@ -1666,9 +1666,12 @@ xfs_fs_fill_super( > "DAX unsupported by block device. Turning off DAX."); > mp->m_flags &= ~XFS_MOUNT_DAX; > } > - if (xfs_sb_version_hasreflink(&mp->m_sb)) > + if (xfs_sb_version_hasreflink(&mp->m_sb)) { > xfs_alert(mp, > "DAX and reflink cannot be used together!"); > + error = -EINVAL; > + goto out_filestream_unmount; > + } > } > > if (mp->m_flags & XFS_MOUNT_DISCARD) { > -- > 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