Skip to content

Commit 4f8b0a5

Browse files
committed
Merge tag 'libnvdimm-fix-v5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm fix from Vishal Verma: "Fix detection of dax support for block devices. Previous fixes in this area, which only affected printing of debug messages, had an incorrect condition for detection of dax. This fix should finally do the right thing" * tag 'libnvdimm-fix-v5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: dax: fix detection of dax support for non-persistent memory block devices
2 parents edf6b0e + 6180bb4 commit 4f8b0a5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/dax/super.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ bool __generic_fsdax_supported(struct dax_device *dax_dev,
100100
return false;
101101
}
102102

103-
if (!dax_dev && !bdev_dax_supported(bdev, blocksize)) {
103+
if (!dax_dev || !bdev_dax_supported(bdev, blocksize)) {
104104
pr_debug("%s: error: dax unsupported by block device\n",
105105
bdevname(bdev, buf));
106106
return false;

0 commit comments

Comments
 (0)