[PATCH 11/12] iomap: Convert iomap_writepages() to use for_each_writeback_folio()

From: Matthew Wilcox (Oracle)
Date: Mon Jun 26 2023 - 13:36:20 EST


This removes one indirect function call per folio, and adds typesafety
by not casting through a void pointer.

Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
---
fs/iomap/buffered-io.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index a4fa81af60d9..a4dd17abe244 100644
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -1711,9 +1711,8 @@ iomap_writepage_map(struct iomap_writepage_ctx *wpc,
* regular allocated space.
*/
static int iomap_do_writepage(struct folio *folio,
- struct writeback_control *wbc, void *data)
+ struct writeback_control *wbc, struct iomap_writepage_ctx *wpc)
{
- struct iomap_writepage_ctx *wpc = data;
struct inode *inode = folio->mapping->host;
u64 end_pos, isize;

@@ -1810,13 +1809,16 @@ iomap_writepages(struct address_space *mapping, struct writeback_control *wbc,
struct iomap_writepage_ctx *wpc,
const struct iomap_writeback_ops *ops)
{
- int ret;
+ struct folio *folio;
+ int err;

wpc->ops = ops;
- ret = write_cache_pages(mapping, wbc, iomap_do_writepage, wpc);
+ for_each_writeback_folio(mapping, wbc, folio, err)
+ err = iomap_do_writepage(folio, wbc, wpc);
+
if (!wpc->ioend)
- return ret;
- return iomap_submit_ioend(wpc, wpc->ioend, ret);
+ return err;
+ return iomap_submit_ioend(wpc, wpc->ioend, err);
}
EXPORT_SYMBOL_GPL(iomap_writepages);

--
2.39.2