Skip to content

Commit c6d1b8d

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

4 files changed

Lines changed: 8 additions & 5 deletions

File tree

fs/gfs2/bmap.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1300,7 +1300,8 @@ static int gfs2_block_zero_range(struct inode *inode, loff_t from,
13001300
unsigned int length)
13011301
{
13021302
BUG_ON(current->journal_info);
1303-
return iomap_zero_range(inode, from, length, NULL, &gfs2_iomap_ops);
1303+
return iomap_zero_range(inode, from, length, NULL, &gfs2_iomap_ops,
1304+
NULL);
13041305
}
13051306

13061307
#define GFS2_JTRUNC_REVOKES 8192

fs/iomap/buffered-io.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1391,13 +1391,14 @@ static loff_t iomap_zero_iter(struct iomap_iter *iter, bool *did_zero)
13911391

13921392
int
13931393
iomap_zero_range(struct inode *inode, loff_t pos, loff_t len, bool *did_zero,
1394-
const struct iomap_ops *ops)
1394+
const struct iomap_ops *ops, void *private)
13951395
{
13961396
struct iomap_iter iter = {
13971397
.inode = inode,
13981398
.pos = pos,
13991399
.len = len,
14001400
.flags = IOMAP_ZERO,
1401+
.private = private,
14011402
};
14021403
struct address_space *mapping = inode->i_mapping;
14031404
unsigned int blocksize = i_blocksize(inode);
@@ -1465,7 +1466,8 @@ iomap_truncate_page(struct inode *inode, loff_t pos, bool *did_zero,
14651466
/* Block boundary? Nothing to do */
14661467
if (!off)
14671468
return 0;
1468-
return iomap_zero_range(inode, pos, blocksize - off, did_zero, ops);
1469+
return iomap_zero_range(inode, pos, blocksize - off, did_zero, ops,
1470+
NULL);
14691471
}
14701472
EXPORT_SYMBOL_GPL(iomap_truncate_page);
14711473

fs/xfs/xfs_iomap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1497,7 +1497,7 @@ xfs_zero_range(
14971497
return dax_zero_range(inode, pos, len, did_zero,
14981498
&xfs_dax_write_iomap_ops);
14991499
return iomap_zero_range(inode, pos, len, did_zero,
1500-
&xfs_buffered_write_iomap_ops);
1500+
&xfs_buffered_write_iomap_ops, NULL);
15011501
}
15021502

15031503
int

include/linux/iomap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ bool iomap_dirty_folio(struct address_space *mapping, struct folio *folio);
313313
int iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len,
314314
const struct iomap_ops *ops);
315315
int iomap_zero_range(struct inode *inode, loff_t pos, loff_t len,
316-
bool *did_zero, const struct iomap_ops *ops);
316+
bool *did_zero, const struct iomap_ops *ops, void *private);
317317
int iomap_truncate_page(struct inode *inode, loff_t pos, bool *did_zero,
318318
const struct iomap_ops *ops);
319319
vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops,

0 commit comments

Comments
 (0)