iomap: Change calling convention for zeroing

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

diff --git a/fs/dax.c b/fs/dax.c
index 994ab66a99071356353365825376c35ae1d4f990..6ad346352a8c5e152411eac07f367e39ba4c5245 100644 (file)
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -1037,18 +1037,18 @@ static vm_fault_t dax_load_hole(struct xa_state *xas,
        return ret;
 }
 
-int dax_iomap_zero(loff_t pos, unsigned offset, unsigned size,
-                  struct iomap *iomap)
+s64 dax_iomap_zero(loff_t pos, u64 length, struct iomap *iomap)
 {
        sector_t sector = iomap_sector(iomap, pos & PAGE_MASK);
        pgoff_t pgoff;
        long rc, id;
        void *kaddr;
        bool page_aligned = false;
-
+       unsigned offset = offset_in_page(pos);
+       unsigned size = min_t(u64, PAGE_SIZE - offset, length);
 
        if (IS_ALIGNED(sector << SECTOR_SHIFT, PAGE_SIZE) &&
-           IS_ALIGNED(size, PAGE_SIZE))
+           (size == PAGE_SIZE))
                page_aligned = true;
 
        rc = bdev_dax_pgoff(iomap->bdev, sector, PAGE_SIZE, &pgoff);
@@ -1058,8 +1058,7 @@ int dax_iomap_zero(loff_t pos, unsigned offset, unsigned size,
        id = dax_read_lock();
 
        if (page_aligned)
-               rc = dax_zero_page_range(iomap->dax_dev, pgoff,
-                                        size >> PAGE_SHIFT);
+               rc = dax_zero_page_range(iomap->dax_dev, pgoff, 1);
        else
                rc = dax_direct_access(iomap->dax_dev, pgoff, 1, &kaddr, NULL);
        if (rc < 0) {
@@ -1072,7 +1071,7 @@ int dax_iomap_zero(loff_t pos, unsigned offset, unsigned size,
                dax_flush(iomap->dax_dev, kaddr + offset, size);
        }
        dax_read_unlock(id);
-       return 0;
+       return size;
 }
 
 static loff_t