swap: remove some calls to compound_head() in swap_readpage()

Replace six implicit calls to compound_head() with one call to
page_folio().

Link: https://lkml.kernel.org/r/20230715042343.434588-5-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Domenico Cerasuolo <cerasuolodomenico@gmail.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Nhat Pham <nphamcs@gmail.com>
Cc: Vitaly Wool <vitaly.wool@konsulko.com>
Cc: Yosry Ahmed <yosryahmed@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/page_io.c b/mm/page_io.c
index ac89685b562bb2dd235c23a05967474afd3ed65d..e3d62c1a08347196e35e8a6639883d606ec08c77 100644 (file)
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -492,14 +492,15 @@ static void swap_readpage_bdev_async(struct page *page,
 
 void swap_readpage(struct page *page, bool synchronous, struct swap_iocb **plug)
 {
+       struct folio *folio = page_folio(page);
        struct swap_info_struct *sis = page_swap_info(page);
-       bool workingset = PageWorkingset(page);
+       bool workingset = folio_test_workingset(folio);
        unsigned long pflags;
        bool in_thrashing;
 
-       VM_BUG_ON_PAGE(!PageSwapCache(page) && !synchronous, page);
-       VM_BUG_ON_PAGE(!PageLocked(page), page);
-       VM_BUG_ON_PAGE(PageUptodate(page), page);
+       VM_BUG_ON_FOLIO(!folio_test_swapcache(folio) && !synchronous, folio);
+       VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio);
+       VM_BUG_ON_FOLIO(folio_test_uptodate(folio), folio);
 
        /*
         * Count submission time as memory stall and delay. When the device
@@ -513,8 +514,8 @@ void swap_readpage(struct page *page, bool synchronous, struct swap_iocb **plug)
        delayacct_swapin_start();
 
        if (zswap_load(page)) {
-               SetPageUptodate(page);
-               unlock_page(page);
+               folio_mark_uptodate(folio);
+               folio_unlock(folio);
        } else if (data_race(sis->flags & SWP_FS_OPS)) {
                swap_readpage_fs(page, plug);
        } else if (synchronous || (sis->flags & SWP_SYNCHRONOUS_IO)) {