mm: convert page_swap_flags to folio_swap_flags

The only caller already has a folio, so push the folio->page conversion
down a level.

Link: https://lkml.kernel.org/r/20220617175020.717127-21-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/swap.h b/mm/swap.h
index 0193797b0c929e186b26f459de918808dd36be5a..85453110be8e3f0ac1c52dfb0adb2e5ee6d7a334 100644 (file)
--- a/mm/swap.h
+++ b/mm/swap.h
@@ -61,9 +61,9 @@ struct page *swap_cluster_readahead(swp_entry_t entry, gfp_t flag,
 struct page *swapin_readahead(swp_entry_t entry, gfp_t flag,
                              struct vm_fault *vmf);
 
-static inline unsigned int page_swap_flags(struct page *page)
+static inline unsigned int folio_swap_flags(struct folio *folio)
 {
-       return page_swap_info(page)->flags;
+       return page_swap_info(&folio->page)->flags;
 }
 #else /* CONFIG_SWAP */
 struct swap_iocb;
@@ -149,7 +149,7 @@ static inline void clear_shadow_from_swap_cache(int type, unsigned long begin,
 {
 }
 
-static inline unsigned int page_swap_flags(struct page *page)
+static inline unsigned int folio_swap_flags(struct folio *folio)
 {
        return 0;
 }

diff --git a/mm/vmscan.c b/mm/vmscan.c
index e660d7205f47323593d3d5659a7606ec5200bbcc..13a28b94cd5693018a539008546bf6dd3cc5e272 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1572,7 +1572,7 @@ static bool may_enter_fs(struct folio *folio, gfp_t gfp_mask)
         * but that will never affect SWP_FS_OPS, so the data_race
         * is safe.
         */
-       return !data_race(page_swap_flags(&folio->page) & SWP_FS_OPS);
+       return !data_race(folio_swap_flags(folio) & SWP_FS_OPS);
 }
 
 /*