From: Toshi Kani <toshi.kani@hpe.com>
To: agk@redhat.com, snitzer@redhat.com, dan.j.williams@intel.com
Cc: ross.zwisler@linux.intel.com, viro@zeniv.linux.org.uk,
axboe@kernel.dk, toshi.kani@hpe.com, linux-nvdimm@ml01.01.org,
dm-devel@redhat.com, linux-raid@vger.kernel.org,
linux-kernel@vger.kernel.org, <linux-fsdevel@vger.kernel.org>
Subject: [PATCH 2/6] block: Check GENHD_FL_DAX for DAX capability
Date: Mon, 13 Jun 2016 16:21:33 -0600 [thread overview]
Message-ID: <1465856497-19698-3-git-send-email-toshi.kani@hpe.com> (raw)
In-Reply-To: <1465856497-19698-1-git-send-email-toshi.kani@hpe.com>
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 <toshi.kani@hpe.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: <linux-fsdevel@vger.kernel.org>
---
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;
next prev parent reply other threads:[~2016-06-13 22:31 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-13 22:21 [PATCH 0/6] Support DAX for device-mapper dm-linear devices Toshi Kani
2016-06-13 22:21 ` [PATCH 1/6] genhd: Add GENHD_FL_DAX to gendisk flags Toshi Kani
2016-06-13 22:21 ` Toshi Kani [this message]
2016-06-13 22:21 ` [PATCH 3/6] dm: Add dm_blk_direct_access() for mapped device Toshi Kani
2016-06-13 22:21 ` [PATCH 4/6] dm-linear: Add linear_direct_access() Toshi Kani
2016-06-13 22:21 ` [PATCH 5/6] dm, dm-linear: Add dax_supported to dm_target Toshi Kani
2016-06-13 22:21 ` [PATCH 6/6] dm: Enable DAX support for mapper device Toshi Kani
2016-06-13 22:57 ` [PATCH 0/6] Support DAX for device-mapper dm-linear devices Mike Snitzer
2016-06-20 18:00 ` Mike Snitzer
2016-06-20 18:31 ` Kani, Toshimitsu
2016-06-20 19:40 ` Mike Snitzer
2016-06-20 19:52 ` Mike Snitzer
2016-06-20 20:11 ` Kani, Toshimitsu
2016-06-20 21:28 ` Kani, Toshimitsu
2016-06-20 22:22 ` Mike Snitzer
2016-06-21 13:41 ` Mike Snitzer
2016-06-21 15:44 ` Kani, Toshimitsu
2016-06-21 15:50 ` Kani, Toshimitsu
2016-06-21 16:25 ` Dan Williams
2016-06-21 16:35 ` Kani, Toshimitsu
2016-06-21 16:45 ` Dan Williams
2016-06-21 16:56 ` Kani, Toshimitsu
2016-06-21 18:17 ` Mike Snitzer
2016-06-22 17:44 ` Kani, Toshimitsu
2016-06-22 19:15 ` Dan Williams
2016-06-22 20:16 ` Kani, Toshimitsu
2016-06-22 22:38 ` Mike Snitzer
2016-06-22 22:59 ` Kani, Toshimitsu
2016-06-13 23:18 ` Dan Williams
2016-06-13 23:59 ` Kani, Toshimitsu
2016-06-14 0:02 ` Dan Williams
2016-06-14 7:30 ` Dan Williams
2016-06-14 13:50 ` Jeff Moyer
2016-06-14 15:41 ` Mike Snitzer
2016-06-14 18:00 ` Kani, Toshimitsu
2016-06-14 20:19 ` Jeff Moyer
2016-06-15 1:46 ` Mike Snitzer
2016-06-15 2:07 ` Dan Williams
2016-06-15 2:35 ` Mike Snitzer
2016-06-14 15:53 ` Kani, Toshimitsu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465856497-19698-3-git-send-email-toshi.kani@hpe.com \
--to=toshi.kani@hpe.com \
--cc=agk@redhat.com \
--cc=axboe@kernel.dk \
--cc=dan.j.williams@intel.com \
--cc=dm-devel@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvdimm@ml01.01.org \
--cc=linux-raid@vger.kernel.org \
--cc=ross.zwisler@linux.intel.com \
--cc=snitzer@redhat.com \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).