diff options
| author | Christoph Hellwig <hch@lst.de> | 2026-02-23 16:20:09 +0300 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2026-03-10 12:29:03 +0300 |
| commit | 4d25c7d68896b4002c4ab5cd646775392bb7fbb4 (patch) | |
| tree | bbedbcbfe6c8a318ee83348a3f340dcee74fad5e | |
| parent | 2580a0095fdc6c1cc632802c5f8ac226e7738d88 (diff) | |
| download | linux-4d25c7d68896b4002c4ab5cd646775392bb7fbb4.tar.xz | |
iomap: pass the iomap_iter to ->submit_read
This provides additional context for file systems.
Rename the fuse instance to match the method name while we're at it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://patch.msgid.link/20260223132021.292832-10-hch@lst.de
Tested-by: Anuj Gupta <anuj20.g@samsung.com>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
| -rw-r--r-- | fs/fuse/file.c | 5 | ||||
| -rw-r--r-- | fs/iomap/bio.c | 3 | ||||
| -rw-r--r-- | fs/iomap/buffered-io.c | 4 | ||||
| -rw-r--r-- | fs/ntfs3/inode.c | 3 | ||||
| -rw-r--r-- | include/linux/iomap.h | 3 |
5 files changed, 11 insertions, 7 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index b1bb7153cb78..a9c836d7f586 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -947,7 +947,8 @@ static int fuse_iomap_read_folio_range_async(const struct iomap_iter *iter, return ret; } -static void fuse_iomap_read_submit(struct iomap_read_folio_ctx *ctx) +static void fuse_iomap_submit_read(const struct iomap_iter *iter, + struct iomap_read_folio_ctx *ctx) { struct fuse_fill_read_data *data = ctx->read_ctx; @@ -958,7 +959,7 @@ static void fuse_iomap_read_submit(struct iomap_read_folio_ctx *ctx) static const struct iomap_read_ops fuse_iomap_read_ops = { .read_folio_range = fuse_iomap_read_folio_range_async, - .submit_read = fuse_iomap_read_submit, + .submit_read = fuse_iomap_submit_read, }; static int fuse_read_folio(struct file *file, struct folio *folio) diff --git a/fs/iomap/bio.c b/fs/iomap/bio.c index 578b1202e037..cb60d1facb5a 100644 --- a/fs/iomap/bio.c +++ b/fs/iomap/bio.c @@ -18,7 +18,8 @@ static void iomap_read_end_io(struct bio *bio) bio_put(bio); } -static void iomap_bio_submit_read(struct iomap_read_folio_ctx *ctx) +static void iomap_bio_submit_read(const struct iomap_iter *iter, + struct iomap_read_folio_ctx *ctx) { struct bio *bio = ctx->read_ctx; diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 00f0efaf12b2..f4ee2b1cb877 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -597,7 +597,7 @@ void iomap_read_folio(const struct iomap_ops *ops, &bytes_submitted); if (ctx->ops->submit_read) - ctx->ops->submit_read(ctx); + ctx->ops->submit_read(&iter, ctx); if (ctx->cur_folio) iomap_read_end(ctx->cur_folio, bytes_submitted); @@ -664,7 +664,7 @@ void iomap_readahead(const struct iomap_ops *ops, &cur_bytes_submitted); if (ctx->ops->submit_read) - ctx->ops->submit_read(ctx); + ctx->ops->submit_read(&iter, ctx); if (ctx->cur_folio) iomap_read_end(ctx->cur_folio, cur_bytes_submitted); diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c index 6e65066ebcc1..511967ef7ec9 100644 --- a/fs/ntfs3/inode.c +++ b/fs/ntfs3/inode.c @@ -651,7 +651,8 @@ static int ntfs_iomap_bio_read_folio_range(const struct iomap_iter *iter, return 0; } -static void ntfs_iomap_bio_submit_read(struct iomap_read_folio_ctx *ctx) +static void ntfs_iomap_bio_submit_read(const struct iomap_iter *iter, + struct iomap_read_folio_ctx *ctx) { struct bio *bio = ctx->read_ctx; diff --git a/include/linux/iomap.h b/include/linux/iomap.h index 99b7209dabd7..6fbe121e2adf 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@ -512,7 +512,8 @@ struct iomap_read_ops { * * This is optional. */ - void (*submit_read)(struct iomap_read_folio_ctx *ctx); + void (*submit_read)(const struct iomap_iter *iter, + struct iomap_read_folio_ctx *ctx); }; /* |