iomap: pass private data to iomap_page_mkwrite

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 cddd62e76f841472eb2c3748222017c048488bdf..59eb5614b339aa842db6fbd8d1f5fefd092259d8 100644 (file)
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -1508,11 +1508,13 @@ static loff_t iomap_folio_mkwrite_iter(struct iomap_iter *iter,
        return length;
 }
 
-vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops)
+vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops,
+               void *private)
 {
        struct iomap_iter iter = {
                .inode          = file_inode(vmf->vma->vm_file),
                .flags          = IOMAP_WRITE | IOMAP_FAULT,
+               .private        = private,
        };
        struct folio *folio = page_folio(vmf->page);
        ssize_t ret;

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index b19916b11fd563d693032c52d49fa38a272a9bd3..a9995878f5985b92b8227a0207a6f8698df048b5 100644 (file)
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -1460,7 +1460,8 @@ xfs_write_fault(
        if (IS_DAX(inode))
                ret = xfs_dax_fault_locked(vmf, order, true);
        else
-               ret = iomap_page_mkwrite(vmf, &xfs_page_mkwrite_iomap_ops);
+               ret = iomap_page_mkwrite(vmf, &xfs_page_mkwrite_iomap_ops,
+                               NULL);
        xfs_iunlock(ip, lock_mode);
 
        sb_end_pagefault(inode->i_sb);

diff --git a/fs/zonefs/file.c b/fs/zonefs/file.c
index 35166c92420c481737f08f6ec27b8d6e6d9fc71a..42e2c0065bb30dd326cd57856ee7cdb987fddebc 100644 (file)
--- a/fs/zonefs/file.c
+++ b/fs/zonefs/file.c
@@ -299,7 +299,7 @@ static vm_fault_t zonefs_filemap_page_mkwrite(struct vm_fault *vmf)
 
        /* Serialize against truncates */
        filemap_invalidate_lock_shared(inode->i_mapping);
-       ret = iomap_page_mkwrite(vmf, &zonefs_write_iomap_ops);
+       ret = iomap_page_mkwrite(vmf, &zonefs_write_iomap_ops, NULL);
        filemap_invalidate_unlock_shared(inode->i_mapping);
 
        sb_end_pagefault(inode->i_sb);

diff --git a/include/linux/iomap.h b/include/linux/iomap.h
index 020af176365c9414cf6a4e8be90802615f38d52f..2bb0bd2b74fecf7be5714a3478db349f9fbe9651 100644 (file)
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@ -302,9 +302,8 @@ int iomap_zero_range(struct inode *inode, loff_t pos, loff_t len,
                bool *did_zero, const struct iomap_ops *ops);
 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);
-
+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,
                struct iomap *iomap);
 void iomap_write_delalloc_release(struct inode *inode, loff_t start_byte,