[PATCH 2/6] block: Check GENHD_FL_DAX for DAX capability
From: Toshi Kani <hidden>
Date: 2016-06-13 22:31:51
Also in:
dm-devel, linux-fsdevel, lkml, nvdimm
Subsystem:
filesystems (vfs and infrastructure), the rest · Maintainers:
Alexander Viro, Christian Brauner, Linus Torvalds
Now that GENHD_FL_DAX is set to all drivers supporting DAX, change bdev_direct_access() and __blkdev_get() to check this GENHD_FL_DAX flag. Signed-off-by: Toshi Kani <redacted> Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: Dan Williams <redacted> Cc: Ross Zwisler <redacted> Cc: <redacted> --- fs/block_dev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 71ccab1..61935ee 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c@@ -493,7 +493,7 @@ long bdev_direct_access(struct block_device *bdev, struct blk_dax_ctl *dax) if (size < 0) return size; - if (!ops->direct_access) + if (!(bdev->bd_disk->flags & GENHD_FL_DAX) || !ops->direct_access) return -EOPNOTSUPP; if ((sector + DIV_ROUND_UP(size, 512)) > part_nr_sects_read(bdev->bd_part))
@@ -1287,7 +1287,8 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) bdev->bd_disk = disk; bdev->bd_queue = disk->queue; bdev->bd_contains = bdev; - if (IS_ENABLED(CONFIG_BLK_DEV_DAX) && disk->fops->direct_access) + if (IS_ENABLED(CONFIG_BLK_DEV_DAX) && + disk->flags & GENHD_FL_DAX) bdev->bd_inode->i_flags = S_DAX; else bdev->bd_inode->i_flags = 0;