iomap: pass private data to iomap_truncate_page

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/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index ce413cf436e93e96f2874a326c572656157aef48..899b5c89afa03b14e498fa2aa9a357bd22e8dbf7 100644 (file)
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -1477,7 +1477,7 @@ EXPORT_SYMBOL_GPL(iomap_zero_range);
 
 int
 iomap_truncate_page(struct inode *inode, loff_t pos, bool *did_zero,
-               const struct iomap_ops *ops)
+               const struct iomap_ops *ops, void *private)
 {
        unsigned int blocksize = i_blocksize(inode);
        unsigned int off = pos & (blocksize - 1);
@@ -1486,7 +1486,7 @@ iomap_truncate_page(struct inode *inode, loff_t pos, bool *did_zero,
        if (!off)
                return 0;
        return iomap_zero_range(inode, pos, blocksize - off, did_zero, ops,
-                       NULL);
+                       private);
 }
 EXPORT_SYMBOL_GPL(iomap_truncate_page);
 

diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 32cc27362a9663168e43c3bd9cdc63e98740ec68..a06d09831fe5cc0060463b8c85b5abd01c85a6c5 100644 (file)
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -1513,5 +1513,5 @@ xfs_truncate_page(
                return dax_truncate_page(inode, pos, did_zero,
                                        &xfs_dax_write_iomap_ops);
        return iomap_truncate_page(inode, pos, did_zero,
-                                  &xfs_buffered_write_iomap_ops);
+                                  &xfs_buffered_write_iomap_ops, NULL);
 }

diff --git a/include/linux/iomap.h b/include/linux/iomap.h
index 149e4145afbc5439c50661b3b0e7b363afe27e65..f0958afc9b836c5fbd3f9da1e84923827463dacc 100644 (file)
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@ -301,7 +301,7 @@ 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, void *private);
 int iomap_truncate_page(struct inode *inode, loff_t pos, bool *did_zero,
-               const struct iomap_ops *ops);
+               const struct iomap_ops *ops, void *private);
 vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops,
                void *private);
 typedef void (*iomap_punch_t)(struct inode *inode, loff_t offset, loff_t length,