From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-nvdimm@ml01.01.org
Subject: [PATCH 04/10] dax: don't pass buffer_head to copy_user_dax
Date: Fri, 9 Sep 2016 18:34:38 +0200 [thread overview]
Message-ID: <1473438884-674-5-git-send-email-hch@lst.de> (raw)
In-Reply-To: <1473438884-674-1-git-send-email-hch@lst.de>
This way we can use this helper for the iomap based DAX implementation
as well.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/dax.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/fs/dax.c b/fs/dax.c
index 98463bb..84343ce 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -580,14 +580,13 @@ static int dax_load_hole(struct address_space *mapping, void *entry,
return VM_FAULT_LOCKED;
}
-static int copy_user_bh(struct page *to, struct inode *inode,
- struct buffer_head *bh, unsigned long vaddr)
+static int copy_user_dax(struct block_device *bdev, sector_t sector, size_t size,
+ struct page *to, unsigned long vaddr)
{
struct blk_dax_ctl dax = {
- .sector = to_sector(bh, inode),
- .size = bh->b_size,
+ .sector = sector,
+ .size = size,
};
- struct block_device *bdev = bh->b_bdev;
void *vto;
if (dax_map_atomic(bdev, &dax) < 0)
@@ -867,7 +866,8 @@ int dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf,
if (vmf->cow_page) {
struct page *new_page = vmf->cow_page;
if (buffer_written(&bh))
- error = copy_user_bh(new_page, inode, &bh, vaddr);
+ error = copy_user_dax(bh.b_bdev, to_sector(&bh, inode),
+ bh.b_size, new_page, vaddr);
else
clear_user_highpage(new_page, vaddr);
if (error)
--
2.1.4
next prev parent reply other threads:[~2016-09-09 16:35 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-09 16:34 iomap based DAX path Christoph Hellwig
2016-09-09 16:34 ` [PATCH 01/10] iomap: add IOMAP_F_NEW flag Christoph Hellwig
2016-09-13 22:43 ` Ross Zwisler
2016-09-14 7:08 ` Christoph Hellwig
2016-09-09 16:34 ` [PATCH 02/10] iomap: expose iomap_apply outside iomap.c Christoph Hellwig
2016-09-13 22:48 ` Ross Zwisler
2016-09-09 16:34 ` [PATCH 03/10] dax: don't pass buffer_head to dax_insert_mapping Christoph Hellwig
2016-09-13 22:53 ` Ross Zwisler
2016-09-09 16:34 ` Christoph Hellwig [this message]
2016-09-13 22:54 ` [PATCH 04/10] dax: don't pass buffer_head to copy_user_dax Ross Zwisler
2016-09-09 16:34 ` [PATCH 05/10] dax: provide an iomap based dax read/write path Christoph Hellwig
2016-09-13 23:00 ` Ross Zwisler
2016-09-09 16:34 ` [PATCH 06/10] dax: provide an iomap based fault handler Christoph Hellwig
2016-09-09 22:55 ` Dave Chinner
2016-09-10 7:36 ` Christoph Hellwig
2016-09-13 15:51 ` Ross Zwisler
2016-09-14 7:06 ` Christoph Hellwig
2016-09-14 9:53 ` Christoph Hellwig
2016-09-23 21:02 ` Ross Zwisler
2016-09-26 0:08 ` Christoph Hellwig
2016-09-26 14:28 ` Jan Kara
2016-09-10 1:38 ` Elliott, Robert (Persistent Memory)
2016-09-13 23:10 ` Ross Zwisler
2016-09-14 7:19 ` Christoph Hellwig
2016-09-14 17:07 ` Ross Zwisler
2016-09-15 5:12 ` Christoph Hellwig
2016-09-15 5:30 ` Darrick J. Wong
2016-09-26 0:05 ` Christoph Hellwig
2016-09-09 16:34 ` [PATCH 07/10] xfs: fix locking for DAX writes Christoph Hellwig
2016-09-09 16:34 ` [PATCH 08/10] xfs: take the ilock shared if possible in xfs_file_iomap_begin Christoph Hellwig
2016-09-09 16:34 ` [PATCH 09/10] xfs: refactor xfs_setfilesize Christoph Hellwig
2016-09-13 23:12 ` Ross Zwisler
2016-09-09 16:34 ` [PATCH 10/10] xfs: use iomap to implement DAX Christoph Hellwig
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=1473438884-674-5-git-send-email-hch@lst.de \
--to=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-nvdimm@ml01.01.org \
--cc=linux-xfs@vger.kernel.org \
/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).