Commit b98c359f authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton
Browse files

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: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 5375336c

mm/swap.h

+3 −3
Original line number Diff line number Diff line
@@ -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;

}

mm/vmscan.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}



/*