dax,iomap: Add helper dax_iomap_zero() to zero a range

[sfrench/cifs-2.6.git] / fs / dax.c

diff --git a/fs/dax.c b/fs/dax.c
index 98ba3756163ae8d539ec273810104c092882e54f..11b16729b86f8041037dbd1186c29636df4f8913 100644 (file)
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -1038,10 +1038,10 @@ static vm_fault_t dax_load_hole(struct xa_state *xas,
        return ret;
 }
 
-int __dax_zero_page_range(struct block_device *bdev,
-               struct dax_device *dax_dev, sector_t sector,
-               unsigned int offset, unsigned int size)
+int dax_iomap_zero(loff_t pos, unsigned offset, unsigned size,
+                  struct iomap *iomap)
 {
+       sector_t sector = iomap_sector(iomap, pos & PAGE_MASK);
        pgoff_t pgoff;
        long rc, id;
        void *kaddr;
@@ -1052,16 +1052,17 @@ int __dax_zero_page_range(struct block_device *bdev,
            IS_ALIGNED(size, PAGE_SIZE))
                page_aligned = true;
 
-       rc = bdev_dax_pgoff(bdev, sector, PAGE_SIZE, &pgoff);
+       rc = bdev_dax_pgoff(iomap->bdev, sector, PAGE_SIZE, &pgoff);
        if (rc)
                return rc;
 
        id = dax_read_lock();
 
        if (page_aligned)
-               rc = dax_zero_page_range(dax_dev, pgoff, size >> PAGE_SHIFT);
+               rc = dax_zero_page_range(iomap->dax_dev, pgoff,
+                                        size >> PAGE_SHIFT);
        else
-               rc = dax_direct_access(dax_dev, pgoff, 1, &kaddr, NULL);
+               rc = dax_direct_access(iomap->dax_dev, pgoff, 1, &kaddr, NULL);
        if (rc < 0) {
                dax_read_unlock(id);
                return rc;
@@ -1069,12 +1070,11 @@ int __dax_zero_page_range(struct block_device *bdev,
 
        if (!page_aligned) {
                memset(kaddr + offset, 0, size);
-               dax_flush(dax_dev, kaddr + offset, size);
+               dax_flush(iomap->dax_dev, kaddr + offset, size);
        }
        dax_read_unlock(id);
        return 0;
 }
-EXPORT_SYMBOL_GPL(__dax_zero_page_range);
 
 static loff_t
 dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data,