diff options
| author | Christoph Hellwig <hch@lst.de> | 2016-09-19 11:24:49 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-09-19 11:24:49 +1000 |
| commit | 1aaba0958ed371bd121751d74d98f2a76395edad (patch) | |
| tree | 1bc7638ec4ea2586d49a0fecf82dccebf7f084d3 /fs/dax.c | |
| parent | befb503ca6e648cc5ed3e3a472d5b5887a60e0f2 (diff) | |
| download | linux-stable-1aaba0958ed371bd121751d74d98f2a76395edad.tar.gz linux-stable-1aaba0958ed371bd121751d74d98f2a76395edad.tar.bz2 linux-stable-1aaba0958ed371bd121751d74d98f2a76395edad.zip | |
dax: don't pass buffer_head to dax_insert_mapping
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>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/dax.c')
| -rw-r--r-- | fs/dax.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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: |