vmscan: use folio_mapped() in shrink_page_list()
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Fri, 13 May 2022 03:23:01 +0000 (20:23 -0700)
committerAndrew Morton <akpm@linux-foundation.org>
Fri, 13 May 2022 14:20:15 +0000 (07:20 -0700)
Remove some legacy function calls.

Link: https://lkml.kernel.org/r/20220504182857.4013401-6-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/vmscan.c

index 9cfce14..e25bca8 100644 (file)
@@ -1572,7 +1572,7 @@ retry:
                if (unlikely(!page_evictable(page)))
                        goto activate_locked;
 
-               if (!sc->may_unmap && page_mapped(page))
+               if (!sc->may_unmap && folio_mapped(folio))
                        goto keep_locked;
 
                /*
@@ -1761,21 +1761,21 @@ retry:
                }
 
                /*
-                * The page is mapped into the page tables of one or more
+                * The folio is mapped into the page tables of one or more
                 * processes. Try to unmap it here.
                 */
-               if (page_mapped(page)) {
+               if (folio_mapped(folio)) {
                        enum ttu_flags flags = TTU_BATCH_FLUSH;
-                       bool was_swapbacked = PageSwapBacked(page);
+                       bool was_swapbacked = folio_test_swapbacked(folio);
 
-                       if (PageTransHuge(page) &&
-                                       thp_order(page) >= HPAGE_PMD_ORDER)
+                       if (folio_test_pmd_mappable(folio))
                                flags |= TTU_SPLIT_HUGE_PMD;
 
                        try_to_unmap(folio, flags);
-                       if (page_mapped(page)) {
+                       if (folio_mapped(folio)) {
                                stat->nr_unmap_fail += nr_pages;
-                               if (!was_swapbacked && PageSwapBacked(page))
+                               if (!was_swapbacked &&
+                                   folio_test_swapbacked(folio))
                                        stat->nr_lazyfree_fail += nr_pages;
                                goto activate_locked;
                        }