Skip to content

Commit 02b39c4

Browse files
Christoph Hellwigbrauner
authored andcommitted
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> Link: https://lore.kernel.org/r/20250206064035.2323428-10-hch@lst.de Reviewed-by: "Darrick J. Wong" <djwong@kernel.org> Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent d06244c commit 02b39c4

4 files changed

Lines changed: 8 additions & 6 deletions

File tree

fs/iomap/buffered-io.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1489,11 +1489,13 @@ static loff_t iomap_folio_mkwrite_iter(struct iomap_iter *iter,
14891489
return length;
14901490
}
14911491

1492-
vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops)
1492+
vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops,
1493+
void *private)
14931494
{
14941495
struct iomap_iter iter = {
14951496
.inode = file_inode(vmf->vma->vm_file),
14961497
.flags = IOMAP_WRITE | IOMAP_FAULT,
1498+
.private = private,
14971499
};
14981500
struct folio *folio = page_folio(vmf->page);
14991501
ssize_t ret;

fs/xfs/xfs_file.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1511,7 +1511,8 @@ xfs_write_fault(
15111511
if (IS_DAX(inode))
15121512
ret = xfs_dax_fault_locked(vmf, order, true);
15131513
else
1514-
ret = iomap_page_mkwrite(vmf, &xfs_buffered_write_iomap_ops);
1514+
ret = iomap_page_mkwrite(vmf, &xfs_buffered_write_iomap_ops,
1515+
NULL);
15151516
xfs_iunlock(ip, lock_mode);
15161517

15171518
sb_end_pagefault(inode->i_sb);

fs/zonefs/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ static vm_fault_t zonefs_filemap_page_mkwrite(struct vm_fault *vmf)
299299

300300
/* Serialize against truncates */
301301
filemap_invalidate_lock_shared(inode->i_mapping);
302-
ret = iomap_page_mkwrite(vmf, &zonefs_write_iomap_ops);
302+
ret = iomap_page_mkwrite(vmf, &zonefs_write_iomap_ops, NULL);
303303
filemap_invalidate_unlock_shared(inode->i_mapping);
304304

305305
sb_end_pagefault(inode->i_sb);

include/linux/iomap.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,8 @@ int iomap_zero_range(struct inode *inode, loff_t pos, loff_t len,
316316
bool *did_zero, const struct iomap_ops *ops);
317317
int iomap_truncate_page(struct inode *inode, loff_t pos, bool *did_zero,
318318
const struct iomap_ops *ops);
319-
vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf,
320-
const struct iomap_ops *ops);
321-
319+
vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops,
320+
void *private);
322321
typedef void (*iomap_punch_t)(struct inode *inode, loff_t offset, loff_t length,
323322
struct iomap *iomap);
324323
void iomap_write_delalloc_release(struct inode *inode, loff_t start_byte,

0 commit comments

Comments
 (0)