]> www.infradead.org Git - users/willy/pagecache.git/commitdiff
iomap: Convert iomap_writepages() to use for_each_writeback_folio()
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Mon, 26 Jun 2023 15:40:27 +0000 (11:40 -0400)
committerMatthew Wilcox (Oracle) <willy@infradead.org>
Wed, 28 Jun 2023 19:15:56 +0000 (15:15 -0400)
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@infradead.org>
fs/iomap/buffered-io.c

index a4fa81af60d9bb0523388df0cdbad477e780bfcc..a4dd17abe244216bc55e13a8020068df2100a71f 100644 (file)
@@ -1711,9 +1711,8 @@ done:
  * 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);