]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
jfs: stop using write_cache_pages
authorChristoph Hellwig <hch@lst.de>
Fri, 11 Jul 2025 08:12:32 +0000 (10:12 +0200)
committerDave Kleikamp <dave.kleikamp@oracle.com>
Mon, 14 Jul 2025 22:08:14 +0000 (17:08 -0500)
Stop using the obsolete write_cache_pages and use writeback_iter directly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
fs/jfs/jfs_metapage.c

index 9029cd2169121326cb6f9ede0f4f757a7c9a56a0..b98cf3bb6c1fef0e4649f7636bd4652979c4c36c 100644 (file)
@@ -421,7 +421,7 @@ static void metapage_write_end_io(struct bio *bio)
 }
 
 static int metapage_write_folio(struct folio *folio,
-               struct writeback_control *wbc, void *unused)
+               struct writeback_control *wbc)
 {
        struct bio *bio = NULL;
        int block_offset;       /* block offset of mp within page */
@@ -550,10 +550,12 @@ static int metapage_writepages(struct address_space *mapping,
                struct writeback_control *wbc)
 {
        struct blk_plug plug;
+       struct folio *folio = NULL;
        int err;
 
        blk_start_plug(&plug);
-       err = write_cache_pages(mapping, wbc, metapage_write_folio, NULL);
+       while ((folio = writeback_iter(mapping, wbc, folio, &err)))
+               err = metapage_write_folio(folio, wbc);
        blk_finish_plug(&plug);
 
        return err;
@@ -813,7 +815,7 @@ static int metapage_write_one(struct folio *folio)
 
        if (folio_clear_dirty_for_io(folio)) {
                folio_get(folio);
-               ret = metapage_write_folio(folio, &wbc, NULL);
+               ret = metapage_write_folio(folio, &wbc);
                if (ret == 0)
                        folio_wait_writeback(folio);
                folio_put(folio);