iomap: pass private data to iomap_zero_range

Allow the file system to pass private data which can be used by the
iomap_begin and iomap_end methods through the private pointer in the
iomap_iter structure.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index 1795c4e8dbf66ac947405b8e019e1db5255b928e..366516b98b3f31c822639e49e18241980c2a1e5b 100644 (file)
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -1300,7 +1300,8 @@ static int gfs2_block_zero_range(struct inode *inode, loff_t from,
                                 unsigned int length)
 {
        BUG_ON(current->journal_info);
-       return iomap_zero_range(inode, from, length, NULL, &gfs2_iomap_ops);
+       return iomap_zero_range(inode, from, length, NULL, &gfs2_iomap_ops,
+                       NULL);
 }
 
 #define GFS2_JTRUNC_REVOKES 8192

diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index 59eb5614b339aa842db6fbd8d1f5fefd092259d8..ce413cf436e93e96f2874a326c572656157aef48 100644 (file)
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -1440,13 +1440,14 @@ static loff_t iomap_zero_iter(struct iomap_iter *iter, bool *did_zero,
 
 int
 iomap_zero_range(struct inode *inode, loff_t pos, loff_t len, bool *did_zero,
-               const struct iomap_ops *ops)
+               const struct iomap_ops *ops, void *private)
 {
        struct iomap_iter iter = {
                .inode          = inode,
                .pos            = pos,
                .len            = len,
                .flags          = IOMAP_ZERO,
+               .private        = private,
        };
        int ret;
        bool range_dirty;
@@ -1484,7 +1485,8 @@ iomap_truncate_page(struct inode *inode, loff_t pos, bool *did_zero,
        /* Block boundary? Nothing to do */
        if (!off)
                return 0;
-       return iomap_zero_range(inode, pos, blocksize - off, did_zero, ops);
+       return iomap_zero_range(inode, pos, blocksize - off, did_zero, ops,
+                       NULL);
 }
 EXPORT_SYMBOL_GPL(iomap_truncate_page);
 

diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index a6fc5acbb6f2c78bd804042c17e4f0e634341961..32cc27362a9663168e43c3bd9cdc63e98740ec68 100644 (file)
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -1498,7 +1498,7 @@ xfs_zero_range(
                return dax_zero_range(inode, pos, len, did_zero,
                                      &xfs_dax_write_iomap_ops);
        return iomap_zero_range(inode, pos, len, did_zero,
-                               &xfs_buffered_write_iomap_ops);
+                               &xfs_buffered_write_iomap_ops, NULL);
 }
 
 int

diff --git a/include/linux/iomap.h b/include/linux/iomap.h
index 2bb0bd2b74fecf7be5714a3478db349f9fbe9651..149e4145afbc5439c50661b3b0e7b363afe27e65 100644 (file)
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@ -299,7 +299,7 @@ int iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len,
                const struct iomap_ops *ops);
 bool iomap_want_unshare_iter(const struct iomap_iter *iter);
 int iomap_zero_range(struct inode *inode, loff_t pos, loff_t len,
-               bool *did_zero, const struct iomap_ops *ops);
+               bool *did_zero, const struct iomap_ops *ops, void *private);
 int iomap_truncate_page(struct inode *inode, loff_t pos, bool *did_zero,
                const struct iomap_ops *ops);
 vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops,