summaryrefslogtreecommitdiffstats
path: root/fs/ext4
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@sandeen.net>2018-12-04 00:46:39 -0500
committerTheodore Ts'o <tytso@mit.edu>2018-12-04 00:46:39 -0500
commit361d24d40657d27bf9ba99a961e04171181b9719 (patch)
treedb5eeb11c8f607b17a21798750414b76ebd3db5f /fs/ext4
parent32ea275008d8c76fa3f40d10d0ffc694a214dfef (diff)
downloadlinux-361d24d40657d27bf9ba99a961e04171181b9719.tar.bz2
ext4: hard fail dax mount on unsupported devices
As dax inches closer to production use, an administrator should not be surprised by silently disabling the feature they asked for. Signed-off-by: Eric Sandeen <sandeen@sandeen.net> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/super.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index a39726cc78bc..e862b82066ab 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3864,12 +3864,12 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
if (ext4_has_feature_inline_data(sb)) {
ext4_msg(sb, KERN_ERR, "Cannot use DAX on a filesystem"
" that may contain inline data");
- sbi->s_mount_opt &= ~EXT4_MOUNT_DAX;
+ goto failed_mount;
}
if (!bdev_dax_supported(sb->s_bdev, blocksize)) {
ext4_msg(sb, KERN_ERR,
- "DAX unsupported by block device. Turning off DAX.");
- sbi->s_mount_opt &= ~EXT4_MOUNT_DAX;
+ "DAX unsupported by block device.");
+ goto failed_mount;
}
}