Message ID | 1539027169-23332-3-git-send-email-sandeen@sandeen.net |
---|---|
State | Accepted, archived |
Headers | show |
Series | ext2, ext4, xfs: hard fail dax mount on unsupported devices | expand |
On Mon, Oct 08, 2018 at 02:32:48PM -0500, Eric Sandeen wrote: > 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> Thanks, applied. - Ted
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 5863fd2..bf0bea5 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3821,12 +3821,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; } }
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> --- fs/ext4/super.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)