diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2021-09-08 15:58:13 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2021-09-08 15:58:13 -0700 |
| commit | 3fc3725357414636d91be1558ce8b14f228b4bda (patch) | |
| tree | e16d052bfac4a5c2da1c9a16cb871e263bfeca3e /fs/ext2 | |
| parent | 32b2397c1e56f33b0b1881def965bb89bd12f448 (diff) | |
| parent | bdd3c50d83bf7f6acc869b48d02670d19030ae03 (diff) | |
| download | linux-3fc3725357414636d91be1558ce8b14f228b4bda.tar.gz linux-3fc3725357414636d91be1558ce8b14f228b4bda.tar.bz2 linux-3fc3725357414636d91be1558ce8b14f228b4bda.zip | |
Merge branch 'for-5.15/fsdax-cleanups' into for-5.15/libnvdimm
Include Christoph's rework of the dax_supported() helpers in the v5.15
libnvdimm update. This supports the ongoing dax-reflink enabling effort.
Diffstat (limited to 'fs/ext2')
| -rw-r--r-- | fs/ext2/super.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 21e09fbaa46f..26e69e48d7e0 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c @@ -949,7 +949,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) blocksize = BLOCK_SIZE << le32_to_cpu(sbi->s_es->s_log_block_size); if (test_opt(sb, DAX)) { - if (!bdev_dax_supported(sb->s_bdev, blocksize)) { + if (!dax_supported(dax_dev, sb->s_bdev, blocksize, 0, + bdev_nr_sectors(sb->s_bdev))) { ext2_msg(sb, KERN_ERR, "DAX unsupported by block device. Turning off DAX."); clear_opt(sbi->s_mount_opt, DAX); |