| Message ID | 151407697703.38751.2935252018151032360.stgit@dwillia2-desk3.amr.corp.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b4b5798cea8f |
| Headers | show |
On Sat 23-12-17 16:56:17, Dan Williams wrote: > 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. > > Signed-off-by: Dan Williams <dan.j.williams@intel.com> You can add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > fs/ext2/super.c | 7 +++++-- > 1 file 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.. */ >
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.. */
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. Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- fs/ext2/super.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)