projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'libnvdimm-for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdim...
[linux-2.6-microblaze.git]
/
fs
/
erofs
/
super.c
diff --git
a/fs/erofs/super.c
b/fs/erofs/super.c
index
a8d49e8
..
11b8855
100644
(file)
--- a/
fs/erofs/super.c
+++ b/
fs/erofs/super.c
@@
-546,7
+546,7
@@
static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
return err;
if (test_opt(ctx, DAX_ALWAYS) &&
return err;
if (test_opt(ctx, DAX_ALWAYS) &&
- !
bdev_dax_supported(sb->s_bdev, EROFS_BLKSIZ
)) {
+ !
dax_supported(sbi->dax_dev, sb->s_bdev, EROFS_BLKSIZ, 0, bdev_nr_sectors(sb->s_bdev)
)) {
errorfc(fc, "DAX unsupported by block device. Turning off DAX.");
clear_opt(ctx, DAX_ALWAYS);
}
errorfc(fc, "DAX unsupported by block device. Turning off DAX.");
clear_opt(ctx, DAX_ALWAYS);
}