mm/page_io: use a folio in __end_swap_bio_write()
authorZhangPeng <zhangpeng362@huawei.com>
Fri, 21 Jul 2023 03:44:45 +0000 (11:44 +0800)
committerAndrew Morton <akpm@linux-foundation.org>
Fri, 18 Aug 2023 17:12:45 +0000 (10:12 -0700)
Saves two implicit call to compound_head().

Link: https://lkml.kernel.org/r/20230721034451.16412-5-zhangpeng362@huawei.com
Signed-off-by: ZhangPeng <zhangpeng362@huawei.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Nanyong Sun <sunnanyong@huawei.com>
Cc: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/page_io.c

index a34f2cd..f2cc5eb 100644 (file)
@@ -29,7 +29,7 @@
 
 static void __end_swap_bio_write(struct bio *bio)
 {
-       struct page *page = bio_first_page_all(bio);
+       struct folio *folio = bio_first_folio_all(bio);
 
        if (bio->bi_status) {
                /*
@@ -40,13 +40,13 @@ static void __end_swap_bio_write(struct bio *bio)
                 *
                 * Also clear PG_reclaim to avoid folio_rotate_reclaimable()
                 */
-               set_page_dirty(page);
+               folio_mark_dirty(folio);
                pr_alert_ratelimited("Write-error on swap-device (%u:%u:%llu)\n",
                                     MAJOR(bio_dev(bio)), MINOR(bio_dev(bio)),
                                     (unsigned long long)bio->bi_iter.bi_sector);
-               ClearPageReclaim(page);
+               folio_clear_reclaim(folio);
        }
-       end_page_writeback(page);
+       folio_end_writeback(folio);
 }
 
 static void end_swap_bio_write(struct bio *bio)