aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2018-01-31 14:21:56 -0800
committerDarrick J. Wong <darrick.wong@oracle.com>2018-02-01 21:06:15 -0800
commitb6e03c10bf3ff08c7678a946a2208b60e66f4426 (patch)
tree176f2d7261ffbf6848f745133db1efbdd89cf9dc /fs
parentxfs: add scrub to XFS_BUILD_OPTIONS (diff)
downloadlinux-dev-b6e03c10bf3ff08c7678a946a2208b60e66f4426.tar.xz
linux-dev-b6e03c10bf3ff08c7678a946a2208b60e66f4426.zip
xfs: don't allow DAX on reflink filesystems
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@oracle.com> Reviewed-by: Bill O'Donnell <billodo@redhat.com> Reviewed-by: Dave Chinner <dchinner@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/xfs/xfs_super.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index f3e0001f9992..0505605e25c1 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) {