diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-09 11:39:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-09 11:39:57 -0700 |
| commit | 2e5fd489a4e5fcc97b035c03ace724c1d481a4c1 (patch) | |
| tree | de1705048e3d2c71c74b7547e149b2973ebb29e1 /fs/ext2 | |
| parent | 4b105f4a256ae629522a7ed1611aba28fd282bd5 (diff) | |
| parent | 3fc3725357414636d91be1558ce8b14f228b4bda (diff) | |
| download | linux-2e5fd489a4e5fcc97b035c03ace724c1d481a4c1.tar.gz linux-2e5fd489a4e5fcc97b035c03ace724c1d481a4c1.tar.bz2 linux-2e5fd489a4e5fcc97b035c03ace724c1d481a4c1.zip | |
Merge tag 'libnvdimm-for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm updates from Dan Williams:
- Fix a race condition in the teardown path of raw mode pmem
namespaces.
- Cleanup the code that filesystems use to detect filesystem-dax
capabilities of their underlying block device.
* tag 'libnvdimm-for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
dax: remove bdev_dax_supported
xfs: factor out a xfs_buftarg_is_dax helper
dax: stub out dax_supported for !CONFIG_FS_DAX
dax: remove __generic_fsdax_supported
dax: move the dax_read_lock() locking into dax_supported
dax: mark dax_get_by_host static
dm: use fs_dax_get_by_bdev instead of dax_get_by_host
dax: stop using bdevname
fsdax: improve the FS_DAX Kconfig description and help text
libnvdimm/pmem: Fix crash triggered when I/O in-flight during unbind
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 987bcf32ed46..d8d580b609ba 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c @@ -946,7 +946,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); |