diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2021-09-09 00:58:13 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2021-09-09 00:58:13 +0200 |
| commit | 3fc3725357414636d91be1558ce8b14f228b4bda (patch) | |
| tree | e16d052bfac4a5c2da1c9a16cb871e263bfeca3e /fs/ext4 | |
| parent | libnvdimm/pmem: Fix crash triggered when I/O in-flight during unbind (diff) | |
| parent | dax: remove bdev_dax_supported (diff) | |
| download | linux-3fc3725357414636d91be1558ce8b14f228b4bda.tar.xz 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/ext4')
| -rw-r--r-- | fs/ext4/super.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index dfa09a277b56..a1726a8debce 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4435,7 +4435,8 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) goto failed_mount; } - if (bdev_dax_supported(sb->s_bdev, blocksize)) + if (dax_supported(dax_dev, sb->s_bdev, blocksize, 0, + bdev_nr_sectors(sb->s_bdev))) set_bit(EXT4_FLAGS_BDEV_IS_DAX, &sbi->s_ext4_flags); if (sbi->s_mount_opt & EXT4_MOUNT_DAX_ALWAYS) { |