From: Matthew Wilcox (Oracle) Date: Fri, 13 May 2022 03:23:04 +0000 (-0700) Subject: mm/shmem: turn shmem_should_replace_page into shmem_should_replace_folio X-Git-Tag: v6.1-rc5~1253^2~102 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=069d849cde3a02c075548ac68a43ed97fc95ee34;p=platform%2Fkernel%2Flinux-starfive.git mm/shmem: turn shmem_should_replace_page into shmem_should_replace_folio This is a straightforward conversion. Link: https://lkml.kernel.org/r/20220504182857.4013401-20-willy@infradead.org Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Christoph Hellwig Signed-off-by: Andrew Morton --- diff --git a/mm/shmem.c b/mm/shmem.c index 2e800d4..d11dc37 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1601,9 +1601,9 @@ failed: * NUMA mempolicy, and applied also to anonymous pages in do_swap_page(); * but for now it is a simple matter of zone. */ -static bool shmem_should_replace_page(struct page *page, gfp_t gfp) +static bool shmem_should_replace_folio(struct folio *folio, gfp_t gfp) { - return page_zonenum(page) > gfp_zone(gfp); + return folio_zonenum(folio) > gfp_zone(gfp); } static int shmem_replace_page(struct page **pagep, gfp_t gfp, @@ -1735,13 +1735,13 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index, */ arch_swap_restore(swap, page); - if (shmem_should_replace_page(page, gfp)) { + folio = page_folio(page); + if (shmem_should_replace_folio(folio, gfp)) { error = shmem_replace_page(&page, gfp, info, index); if (error) goto failed; } - folio = page_folio(page); error = shmem_add_to_page_cache(folio, mapping, index, swp_to_radix_entry(swap), gfp, charge_mm);