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>

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index b1bb7153cb785f604307f34308e8d161e7596585..a9c836d7f5861659f5d809890e28e9fe41013cda 100644 (file)
--- 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 578b1202e0373a595ba5b45d128fe61b5a8329e3..cb60d1facb5a8fe6a0fd3287d9f64c554fe752a1 100644 (file)
--- 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 00f0efaf12b226ab4ae0104658a2b391618a24cd..f4ee2b1cb877acb77e8ae44dc46bf6853255a612 100644 (file)
--- 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 6e65066ebcc1ae81d3bfdd14f4babfc2898b075e..511967ef7ec9c786da271ea1c042b73cebe5500b 100644 (file)
--- 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 99b7209dabd77c953837404c52076bee9cd28685..6fbe121e2adfd8060447e41c0b3eb272280deb0b 100644 (file)
--- 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);
 };
 
 /*