summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-09-12 12:43:58 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-09-12 12:43:58 -0700
commit4f8b0a5b3f7e5f03b188de9025b60c15559790f9 (patch)
tree2a86d7ddb05ecba277524e04680fc535385b7a6f
parentedf6b0e1e4ddb12e022ce0c17829bad6d4161ea7 (diff)
parent6180bb446ab624b9ab8bf201ed251ca87f07b413 (diff)
downloadlinux-sh-4f8b0a5b3f7e5f03b188de9025b60c15559790f9.tar.gz
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
-rw-r--r--drivers/dax/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dax/super.c b/drivers/dax/super.c
index 32642634c1bb..e5767c83ea23 100644
--- a/drivers/dax/super.c
+++ b/drivers/dax/super.c
@@ -100,7 +100,7 @@ bool __generic_fsdax_supported(struct dax_device *dax_dev,
return false;
}
- if (!dax_dev && !bdev_dax_supported(bdev, blocksize)) {
+ if (!dax_dev || !bdev_dax_supported(bdev, blocksize)) {
pr_debug("%s: error: dax unsupported by block device\n",
bdevname(bdev, buf));
return false;