->readpage was deprecated and reads are now on folios. Signed-off-by: Joanne Koong Reviewed-by: "Darrick J. Wong" --- fs/iomap/buffered-io.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index c376a793e4c5..008042108c68 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -350,7 +350,7 @@ static void iomap_read_end_io(struct bio *bio) bio_put(bio); } -struct iomap_readpage_ctx { +struct iomap_read_folio_ctx { struct folio *cur_folio; /* * Is the folio owned by this readpage context, or by some @@ -362,7 +362,7 @@ struct iomap_readpage_ctx { struct readahead_control *rac; }; -static void iomap_submit_read_bio(struct iomap_readpage_ctx *ctx) +static void iomap_submit_read_bio(struct iomap_read_folio_ctx *ctx) { struct bio *bio = ctx->private; @@ -377,7 +377,7 @@ static void iomap_submit_read_bio(struct iomap_readpage_ctx *ctx) * Buffered writes must read in the folio synchronously. */ static void iomap_read_folio_range_bio_async(const struct iomap_iter *iter, - struct iomap_readpage_ctx *ctx, loff_t pos, size_t plen) + struct iomap_read_folio_ctx *ctx, loff_t pos, size_t plen) { struct folio *folio = ctx->cur_folio; const struct iomap *iomap = &iter->iomap; @@ -424,7 +424,7 @@ static void iomap_read_folio_range_bio_async(const struct iomap_iter *iter, } static int iomap_read_folio_iter(struct iomap_iter *iter, - struct iomap_readpage_ctx *ctx) + struct iomap_read_folio_ctx *ctx) { const struct iomap *iomap = &iter->iomap; loff_t pos = iter->pos; @@ -476,7 +476,7 @@ int iomap_read_folio(struct folio *folio, const struct iomap_ops *ops) .pos = folio_pos(folio), .len = folio_size(folio), }; - struct iomap_readpage_ctx ctx = { + struct iomap_read_folio_ctx ctx = { .cur_folio = folio, }; int ret; @@ -496,7 +496,7 @@ int iomap_read_folio(struct folio *folio, const struct iomap_ops *ops) EXPORT_SYMBOL_GPL(iomap_read_folio); static int iomap_readahead_iter(struct iomap_iter *iter, - struct iomap_readpage_ctx *ctx) + struct iomap_read_folio_ctx *ctx) { int ret; @@ -541,7 +541,7 @@ void iomap_readahead(struct readahead_control *rac, const struct iomap_ops *ops) .pos = readahead_pos(rac), .len = readahead_length(rac), }; - struct iomap_readpage_ctx ctx = { + struct iomap_read_folio_ctx ctx = { .rac = rac, }; -- 2.47.3