iomap: make iomap_read_folio() a void return

No errors are propagated in iomap_read_folio(). Change
iomap_read_folio() to a void return to make this clearer to callers.

Signed-off-by: Joanne Koong <joannelkoong@gmail.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index 0d88a4f3c79170fea92abdbce6b5642ba9ea3343..1dbcac17fefd946aa5963435d3ee1184a9e1a61b 100644 (file)
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -495,7 +495,7 @@ static int iomap_read_folio_iter(struct iomap_iter *iter,
        return 0;
 }
 
-int iomap_read_folio(const struct iomap_ops *ops,
+void iomap_read_folio(const struct iomap_ops *ops,
                struct iomap_read_folio_ctx *ctx)
 {
        struct folio *folio = ctx->cur_folio;
@@ -516,13 +516,6 @@ int iomap_read_folio(const struct iomap_ops *ops,
                ctx->ops->submit_read(ctx);
 
        iomap_read_end(folio, bytes_pending);
-
-       /*
-        * Just like mpage_readahead and block_read_full_folio, we always
-        * return 0 and just set the folio error flag on errors.  This
-        * should be cleaned up throughout the stack eventually.
-        */
-       return 0;
 }
 EXPORT_SYMBOL_GPL(iomap_read_folio);
 

diff --git a/include/linux/iomap.h b/include/linux/iomap.h
index 37435b9127558898695015bddf90b9239e079c52..6d864b446b6e6231b4ab206f61456c78f11ac1be 100644 (file)
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@ -338,7 +338,7 @@ static inline bool iomap_want_unshare_iter(const struct iomap_iter *iter)
 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);
-int iomap_read_folio(const struct iomap_ops *ops,
+void iomap_read_folio(const struct iomap_ops *ops,
                struct iomap_read_folio_ctx *ctx);
 void iomap_readahead(const struct iomap_ops *ops,
                struct iomap_read_folio_ctx *ctx);