diff options
| author | Gao Xiang <xiang@kernel.org> | 2026-01-23 19:32:25 +0800 |
|---|---|---|
| committer | Gao Xiang <xiang@kernel.org> | 2026-01-23 19:32:25 +0800 |
| commit | 0bd20d8ee3f7b449241d690a17cf0a4981e1c959 (patch) | |
| tree | 95ed09e1a7a74045db6161f38432eba3223e0387 /include | |
| parent | 58d081ea4eab924b9e5a55cbb151bde847068c8d (diff) | |
| parent | 3431d387a7042c754e27152c287c6e706b46f139 (diff) | |
Merge branch 'vfs-7.0.iomap' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/vfs/vfs
Pull 'vfs-7.0.iomap' to allow iomap page cache users to set
`iomap_iter::private` for the upcoming page cache sharing support.
It also includes a patch to avoid triggering inline data reads for
the FIEMAP operation.
Signed-off-by: Gao Xiang <xiang@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/iomap.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/iomap.h b/include/linux/iomap.h index 6bb941707d12..83cdeff3d41c 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@ -345,9 +345,9 @@ ssize_t iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *from, const struct iomap_ops *ops, const struct iomap_write_ops *write_ops, void *private); void iomap_read_folio(const struct iomap_ops *ops, - struct iomap_read_folio_ctx *ctx); + struct iomap_read_folio_ctx *ctx, void *private); void iomap_readahead(const struct iomap_ops *ops, - struct iomap_read_folio_ctx *ctx); + struct iomap_read_folio_ctx *ctx, void *private); bool iomap_is_partially_uptodate(struct folio *, size_t from, size_t count); struct folio *iomap_get_folio(struct iomap_iter *iter, loff_t pos, size_t len); bool iomap_release_folio(struct folio *folio, gfp_t gfp_flags); @@ -599,7 +599,7 @@ static inline void iomap_bio_read_folio(struct folio *folio, .cur_folio = folio, }; - iomap_read_folio(ops, &ctx); + iomap_read_folio(ops, &ctx, NULL); } static inline void iomap_bio_readahead(struct readahead_control *rac, @@ -610,7 +610,7 @@ static inline void iomap_bio_readahead(struct readahead_control *rac, .rac = rac, }; - iomap_readahead(ops, &ctx); + iomap_readahead(ops, &ctx, NULL); } #endif /* CONFIG_BLOCK */ |