Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Matthew Wilcox (Oracle) and committed by
akpm
b98c359f 5375336c

+4 -4
+3 -3
mm/swap.h
··· 61 61 struct page *swapin_readahead(swp_entry_t entry, gfp_t flag, 62 62 struct vm_fault *vmf); 63 63 64 - static inline unsigned int page_swap_flags(struct page *page) 64 + static inline unsigned int folio_swap_flags(struct folio *folio) 65 65 { 66 - return page_swap_info(page)->flags; 66 + return page_swap_info(&folio->page)->flags; 67 67 } 68 68 #else /* CONFIG_SWAP */ 69 69 struct swap_iocb; ··· 149 149 { 150 150 } 151 151 152 - static inline unsigned int page_swap_flags(struct page *page) 152 + static inline unsigned int folio_swap_flags(struct folio *folio) 153 153 { 154 154 return 0; 155 155 }
+1 -1
mm/vmscan.c
··· 1572 1572 * but that will never affect SWP_FS_OPS, so the data_race 1573 1573 * is safe. 1574 1574 */ 1575 - return !data_race(page_swap_flags(&folio->page) & SWP_FS_OPS); 1575 + return !data_race(folio_swap_flags(folio) & SWP_FS_OPS); 1576 1576 } 1577 1577 1578 1578 /*