From 361d24d40657d27bf9ba99a961e04171181b9719 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Tue, 4 Dec 2018 00:46:39 -0500 Subject: [PATCH] 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 Signed-off-by: Theodore Ts'o --- fs/ext4/super.c | 6 +++--- 1 file 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; } } -- 2.45.2