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

Link: https://lkml.kernel.org/r/20230721034451.16412-6-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 f2cc5eb..6faaaa9 100644 (file)
@@ -57,16 +57,16 @@ static void end_swap_bio_write(struct bio *bio)
 
 static void __end_swap_bio_read(struct bio *bio)
 {
-       struct page *page = bio_first_page_all(bio);
+       struct folio *folio = bio_first_folio_all(bio);
 
        if (bio->bi_status) {
                pr_alert_ratelimited("Read-error on swap-device (%u:%u:%llu)\n",
                                     MAJOR(bio_dev(bio)), MINOR(bio_dev(bio)),
                                     (unsigned long long)bio->bi_iter.bi_sector);
        } else {
-               SetPageUptodate(page);
+               folio_mark_uptodate(folio);
        }
-       unlock_page(page);
+       folio_unlock(folio);
 }
 
 static void end_swap_bio_read(struct bio *bio)