summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorChristian Brauner <brauner@kernel.org>2026-01-14 16:31:46 +0100
committerChristian Brauner <brauner@kernel.org>2026-01-14 16:31:46 +0100
commit3431d387a7042c754e27152c287c6e706b46f139 (patch)
tree39801f60da8748aa44aae13f7aa0b3050118737b /include
parent8f0b4cce4481fb22653697cced8d0d04027cb1e8 (diff)
parent8d407bb32186f4a06a97871af4d5cc45444602fb (diff)
Merge patch series "iomap: erofs page cache sharing preliminaries"
Bring in the two changes needed in iomap and erofs to enable the page cache sharing work. * patches from https://patch.msgid.link/20260109102856.598531-1-lihongbo22@huawei.com: erofs: hold read context in iomap_iter if needed iomap: stash iomap read ctx in the private field of iomap_iter Link: https://patch.msgid.link/20260109102856.598531-1-lihongbo22@huawei.com Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/iomap.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/iomap.h b/include/linux/iomap.h
index 520e967cb501..441d614e9fdf 100644
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@ -341,9 +341,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);
@@ -595,7 +595,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,
@@ -606,7 +606,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 */