diff options
| author | Dan Williams | 2017-12-22 03:18:27 +0100 |
|---|---|---|
| committer | Dan Williams | 2018-01-20 01:50:53 +0100 |
| commit | b4b5798cea8f40ab61f3a2c79a26314465dd83e3 (patch) | |
| tree | 6af0b815e7de22664f6807867cc0f25c8c7ce0d8 /fs/ext2 | |
| parent | ext4: auto disable dax instead of failing mount (diff) | |
| download | kernel-qcow2-linux-b4b5798cea8f40ab61f3a2c79a26314465dd83e3.tar.gz kernel-qcow2-linux-b4b5798cea8f40ab61f3a2c79a26314465dd83e3.tar.xz kernel-qcow2-linux-b4b5798cea8f40ab61f3a2c79a26314465dd83e3.zip | |
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 <jack@suse.cz>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'fs/ext2')
| -rw-r--r-- | fs/ext2/super.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 7646818ab266..38f9222606ee 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.. */ |