[PATCH v2 06/16] iomap: add wrapper function iomap_submit_bio()

[Joanne Koong <joannelkoong@xxxxxxxxx>]

Add a wrapper function, iomap_submit_bio(), around bio submission so
that callers that do not have CONFIG_BLOCK set may also use iomap for
buffered io.

Signed-off-by: Joanne Koong <joannelkoong@xxxxxxxxx>
---
 fs/iomap/buffered-io-bio.c | 5 +++++
 fs/iomap/buffered-io.c     | 6 +++---
 fs/iomap/internal.h        | 2 ++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/fs/iomap/buffered-io-bio.c b/fs/iomap/buffered-io-bio.c
index 89c06cabbb1b..d5dfa1b3eef7 100644
--- a/fs/iomap/buffered-io-bio.c
+++ b/fs/iomap/buffered-io-bio.c
@@ -81,6 +81,11 @@ void iomap_bio_readpage(const struct iomap *iomap, loff_t pos,
 	}
 }
 
+void iomap_submit_bio(struct bio *bio)
+{
+	submit_bio(bio);
+}
+
 int iomap_bio_read_folio_sync(loff_t block_start, struct folio *folio,
 		size_t poff, size_t plen, const struct iomap *iomap)
 {
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index 9ce792adf8a4..882e55a1d75c 100644
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -388,7 +388,7 @@ int iomap_read_folio(struct folio *folio, const struct iomap_ops *ops)
 		iter.status = iomap_read_folio_iter(&iter, &ctx);
 
 	if (ctx.bio) {
-		submit_bio(ctx.bio);
+		iomap_submit_bio(ctx.bio);
 		WARN_ON_ONCE(!ctx.cur_folio_in_bio);
 	} else {
 		WARN_ON_ONCE(ctx.cur_folio_in_bio);
@@ -460,7 +460,7 @@ void iomap_readahead(struct readahead_control *rac, const struct iomap_ops *ops)
 		iter.status = iomap_readahead_iter(&iter, &ctx);
 
 	if (ctx.bio)
-		submit_bio(ctx.bio);
+		iomap_submit_bio(ctx.bio);
 	if (ctx.cur_folio) {
 		if (!ctx.cur_folio_in_bio)
 			folio_unlock(ctx.cur_folio);
@@ -1463,7 +1463,7 @@ int iomap_submit_ioend(struct iomap_writepage_ctx *wpc, int error)
 		if (WARN_ON_ONCE(wpc->iomap.flags & IOMAP_F_ANON_WRITE))
 			error = -EIO;
 		if (!error)
-			submit_bio(&wpc->ioend->io_bio);
+			iomap_submit_bio(&wpc->ioend->io_bio);
 	}
 
 	if (error)
diff --git a/fs/iomap/internal.h b/fs/iomap/internal.h
index 664554ffb8bf..27e8a174dc3f 100644
--- a/fs/iomap/internal.h
+++ b/fs/iomap/internal.h
@@ -44,11 +44,13 @@ void iomap_bio_readpage(const struct iomap *iomap, loff_t pos,
 		struct iomap_readpage_ctx *ctx, size_t poff, size_t plen,
 		loff_t length);
 void iomap_bio_ioend_error(struct iomap_writepage_ctx *wpc, int error);
+void iomap_submit_bio(struct bio *bio);
 #else
 #define iomap_bio_read_folio_sync(...)		(-ENOSYS)
 #define iomap_bio_add_to_ioend(...)		(-ENOSYS)
 #define iomap_bio_readpage(...)		((void)0)
 #define iomap_bio_ioend_error(...)		((void)0)
+#define iomap_submit_bio(...)			((void)0)
 #endif /* CONFIG_BLOCK */
 
 #endif /* _IOMAP_INTERNAL_H */
-- 
2.47.1