|
@@ -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:
|