From: Jon Derrick <jonathan.derrick@intel.com>
To: linux-block@vger.kernel.org
Cc: Jon Derrick <jonathan.derrick@intel.com>,
"Jens Axboe" <axboe@fb.com>,
"Alexander Viro" <viro@zeniv.linux.org.uk>,
linux-fsdevel@vger.kernel.org,
"Dan Williams" <dan.j.williams@intel.com>,
"Jeff Moyer" <jmoyer@redhat.com>,
"Stephen Bates" <stephen.bates@microsemi.com>,
"Keith Busch" <keith.busch@intel.com>,
linux-nvme@lists.infradead.org,
"Christoph Hellwig" <hch@infradead.org>
Subject: [RFCv2 2/3] block: add helper for setting and clearing S_DAX on inode
Date: Fri, 13 May 2016 18:02:47 -0600 [thread overview]
Message-ID: <1463184168-3381-3-git-send-email-jonathan.derrick@intel.com> (raw)
In-Reply-To: <1463184168-3381-1-git-send-email-jonathan.derrick@intel.com>
inode->i_flags locking rules suggest using the i_mutex lock. This patch
adds a helper to do the locking and setting of S_DAX on the block device
inode.
Signed-off-by: Jon Derrick <jonathan.derrick@intel.com>
---
fs/block_dev.c | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/fs/block_dev.c b/fs/block_dev.c
index d4fa725..252e459 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1159,6 +1159,18 @@ void bd_set_size(struct block_device *bdev, loff_t size)
}
EXPORT_SYMBOL(bd_set_size);
+static void bd_set_dax(struct block_device *bdev, bool enabled)
+{
+ struct inode *inode = bdev->bd_inode;
+
+ inode_lock(inode);
+ if (enabled)
+ inode->i_flags = S_DAX;
+ else
+ inode->i_flags &= ~S_DAX;
+ inode_unlock(inode);
+}
+
static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part);
/*
@@ -1206,9 +1218,9 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
bdev->bd_queue = disk->queue;
bdev->bd_contains = bdev;
if (IS_ENABLED(CONFIG_BLK_DEV_DAX) && disk->fops->direct_access)
- bdev->bd_inode->i_flags = S_DAX;
+ bd_set_dax(bdev, 1);
else
- bdev->bd_inode->i_flags &= ~S_DAX;
+ bd_set_dax(bdev, 0);
if (!partno) {
ret = -ENXIO;
@@ -1239,7 +1251,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
if (!ret) {
bd_set_size(bdev,(loff_t)get_capacity(disk)<<9);
if (!blkdev_dax_capable(bdev))
- bdev->bd_inode->i_flags &= ~S_DAX;
+ bd_set_dax(bdev, 0);
}
/*
@@ -1276,7 +1288,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
}
bd_set_size(bdev, (loff_t)bdev->bd_part->nr_sects << 9);
if (!blkdev_dax_capable(bdev))
- bdev->bd_inode->i_flags &= ~S_DAX;
+ bd_set_dax(bdev, 0);
}
} else {
if (bdev->bd_contains == bdev) {
--
1.8.3.1
next prev parent reply other threads:[~2016-05-14 0:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-14 0:02 [RFCv2 0/3] Support for high-priority block device flag Jon Derrick
2016-05-14 0:02 ` [RFCv2 1/3] block: allow other bd i_node flags when DAX is disabled Jon Derrick
2016-05-14 0:02 ` Jon Derrick [this message]
2016-05-14 5:05 ` [RFCv2 2/3] block: add helper for setting and clearing S_DAX on inode Elliott, Robert (Persistent Memory)
2016-05-16 17:31 ` Jon Derrick
2016-05-14 0:02 ` [RFCv2 3/3] block: Introduce S_HIPRI inode flag Jon Derrick
2016-05-14 14:22 ` Dan Williams
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=1463184168-3381-3-git-send-email-jonathan.derrick@intel.com \
--to=jonathan.derrick@intel.com \
--cc=axboe@fb.com \
--cc=dan.j.williams@intel.com \
--cc=hch@infradead.org \
--cc=jmoyer@redhat.com \
--cc=keith.busch@intel.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=stephen.bates@microsemi.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).