From: Dan Williams Date: Fri, 22 Dec 2017 02:18:27 +0000 (-0800) Subject: ext2: auto disable dax instead of failing mount X-Git-Tag: v4.19~1638^2~1^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b4b5798cea8f40ab61f3a2c79a26314465dd83e3;p=platform%2Fkernel%2Flinux-rpi.git ext2: auto disable dax instead of failing mount Bring the ext2 filesystem in line with xfs that only warns and continues when the "-o dax" option is specified to mount and the backing device does not support dax. This is in preparation for removing dax support from devices that do not enable get_user_pages() operations on dax mappings. In other words 'gup' support is required and configurations that were using so called 'page-less' dax will be converted back to using the page cache. Removing the broken 'page-less' dax support is a pre-requisite for removing the "EXPERIMENTAL" warning when mounting a filesystem in dax mode. Reviewed-by: Jan Kara Signed-off-by: Dan Williams --- diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 7646818..38f9222 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c @@ -959,8 +959,11 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) if (sbi->s_mount_opt & EXT2_MOUNT_DAX) { err = bdev_dax_supported(sb, blocksize); - if (err) - goto failed_mount; + if (err) { + ext2_msg(sb, KERN_ERR, + "DAX unsupported by block device. Turning off DAX."); + sbi->s_mount_opt &= ~EXT2_MOUNT_DAX; + } } /* If the blocksize doesn't match, re-read the thing.. */