| Message ID | 1473438884-674-4-git-send-email-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Sep 09, 2016 at 06:34:37PM +0200, Christoph Hellwig wrote: > This way we can use this helper for the iomap based DAX implementation > as well. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com> > --- > fs/dax.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/fs/dax.c b/fs/dax.c > index 993dc6f..98463bb 100644 > --- a/fs/dax.c > +++ b/fs/dax.c > @@ -790,14 +790,13 @@ int dax_writeback_mapping_range(struct address_space *mapping, > EXPORT_SYMBOL_GPL(dax_writeback_mapping_range); > > static int dax_insert_mapping(struct address_space *mapping, > - struct buffer_head *bh, void **entryp, > - struct vm_area_struct *vma, struct vm_fault *vmf) > + struct block_device *bdev, sector_t sector, size_t size, > + void **entryp, struct vm_area_struct *vma, struct vm_fault *vmf) > { > unsigned long vaddr = (unsigned long)vmf->virtual_address; > - struct block_device *bdev = bh->b_bdev; > struct blk_dax_ctl dax = { > - .sector = to_sector(bh, mapping->host), > - .size = bh->b_size, > + .sector = sector, > + .size = size, > }; > void *ret; > void *entry = *entryp; > @@ -898,7 +897,8 @@ int dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf, > > /* Filesystem should not return unwritten buffers to us! */ > WARN_ON_ONCE(buffer_unwritten(&bh) || buffer_new(&bh)); > - error = dax_insert_mapping(mapping, &bh, &entry, vma, vmf); > + error = dax_insert_mapping(mapping, bh.b_bdev, to_sector(&bh, inode), > + bh.b_size, &entry, vma, vmf); > unlock_entry: > put_locked_mapping_entry(mapping, vmf->pgoff, entry); > out: > -- > 2.1.4 > > _______________________________________________ > Linux-nvdimm mailing list > Linux-nvdimm@lists.01.org > https://lists.01.org/mailman/listinfo/linux-nvdimm -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/dax.c b/fs/dax.c index 993dc6f..98463bb 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -790,14 +790,13 @@ int dax_writeback_mapping_range(struct address_space *mapping, EXPORT_SYMBOL_GPL(dax_writeback_mapping_range); static int dax_insert_mapping(struct address_space *mapping, - struct buffer_head *bh, void **entryp, - struct vm_area_struct *vma, struct vm_fault *vmf) + struct block_device *bdev, sector_t sector, size_t size, + void **entryp, struct vm_area_struct *vma, struct vm_fault *vmf) { unsigned long vaddr = (unsigned long)vmf->virtual_address; - struct block_device *bdev = bh->b_bdev; struct blk_dax_ctl dax = { - .sector = to_sector(bh, mapping->host), - .size = bh->b_size, + .sector = sector, + .size = size, }; void *ret; void *entry = *entryp; @@ -898,7 +897,8 @@ int dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf, /* Filesystem should not return unwritten buffers to us! */ WARN_ON_ONCE(buffer_unwritten(&bh) || buffer_new(&bh)); - error = dax_insert_mapping(mapping, &bh, &entry, vma, vmf); + error = dax_insert_mapping(mapping, bh.b_bdev, to_sector(&bh, inode), + bh.b_size, &entry, vma, vmf); unlock_entry: put_locked_mapping_entry(mapping, vmf->pgoff, entry); out:
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(-)