Replace usage of bdev_dax_pgoff() with dax_pgoff() in fs/dax.c
Signed-off-by: Vivek Goyal <[email protected]>
---
fs/dax.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/fs/dax.c b/fs/dax.c
index 35da144375a0..921042a81538 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -680,7 +680,7 @@ int dax_invalidate_mapping_entry_sync(struct address_space
*mapping,
return __dax_invalidate_entry(mapping, index, false);
}
-static int copy_user_dax(struct block_device *bdev, struct dax_device *dax_dev,
+static int copy_user_dax(struct dax_device *dax_dev, sector_t dax_offset,
sector_t sector, size_t size, struct page *to,
unsigned long vaddr)
{
@@ -689,7 +689,7 @@ static int copy_user_dax(struct block_device *bdev, struct
dax_device *dax_dev,
long rc;
int id;
- rc = bdev_dax_pgoff(bdev, sector, size, &pgoff);
+ rc = dax_pgoff(dax_offset, sector, size, &pgoff);
if (rc)
return rc;
@@ -990,7 +990,7 @@ static int dax_iomap_pfn(struct iomap *iomap, loff_t pos,
size_t size,
int id, rc;
long length;
- rc = bdev_dax_pgoff(iomap->bdev, sector, size, &pgoff);
+ rc = dax_pgoff(iomap->dax_offset, sector, size, &pgoff);
if (rc)
return rc;
id = dax_read_lock();
@@ -1065,7 +1065,7 @@ int __dax_zero_page_range(struct block_device *bdev,
long rc, id;
void *kaddr;
- rc = bdev_dax_pgoff(bdev, sector, PAGE_SIZE, &pgoff);
+ rc = dax_pgoff(get_start_sect(bdev), sector, PAGE_SIZE, &pgoff);
if (rc)
return rc;
@@ -1087,7 +1087,6 @@ static loff_t
dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data,
struct iomap *iomap, struct iomap *srcmap)
{
- struct block_device *bdev = iomap->bdev;
struct dax_device *dax_dev = iomap->dax_dev;
struct iov_iter *iter = data;
loff_t end = pos + length, done = 0;
@@ -1132,7 +1131,7 @@ dax_iomap_actor(struct inode *inode, loff_t pos, loff_t
length, void *data,
break;
}
- ret = bdev_dax_pgoff(bdev, sector, size, &pgoff);
+ ret = dax_pgoff(iomap->dax_offset, sector, size, &pgoff);
if (ret)
break;
@@ -1312,7 +1311,7 @@ static vm_fault_t dax_iomap_pte_fault(struct vm_fault
*vmf, pfn_t *pfnp,
clear_user_highpage(vmf->cow_page, vaddr);
break;
case IOMAP_MAPPED:
- error = copy_user_dax(iomap.bdev, iomap.dax_dev,
+ error = copy_user_dax(iomap.dax_dev, iomap.dax_offset,
sector, PAGE_SIZE, vmf->cow_page,
vaddr);
break;
default:
--
2.20.1
_______________________________________________
Linux-nvdimm mailing list -- [email protected]
To unsubscribe send an email to [email protected]
