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

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: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent b7dd44a1

mm/shmem.c

+4 −4
Original line number Diff line number Diff line
@@ -1601,9 +1601,9 @@ static struct page *shmem_alloc_and_acct_page(gfp_t gfp, 
 * 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);