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

shmem: convert shmem_replace_page() to shmem_replace_folio() 

The caller has a folio, so convert the calling convention and rename the
function.

Link: https://lkml.kernel.org/r/20220902194653.1739778-19-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 7a7256d5

mm/shmem.c

+4 −5
Original line number Diff line number Diff line
@@ -1608,7 +1608,7 @@ static bool shmem_should_replace_folio(struct folio *folio, gfp_t gfp) 
	return folio_zonenum(folio) > gfp_zone(gfp);

}



static int shmem_replace_page(struct page **pagep, gfp_t gfp,

static int shmem_replace_folio(struct folio **foliop, gfp_t gfp,

				struct shmem_inode_info *info, pgoff_t index)

{

	struct folio *old, *new;
@@ -1617,7 +1617,7 @@ static int shmem_replace_page(struct page **pagep, gfp_t gfp, 
	pgoff_t swap_index;

	int error;



	old = page_folio(*pagep);

	old = *foliop;

	entry = folio_swap_entry(old);

	swap_index = swp_offset(entry);

	swap_mapping = swap_address_space(entry);
@@ -1666,7 +1666,7 @@ static int shmem_replace_page(struct page **pagep, gfp_t gfp, 
		old = new;

	} else {

		folio_add_lru(new);

		*pagep = &new->page;

		*foliop = new;

	}



	folio_clear_swapcache(old);
@@ -1772,8 +1772,7 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, 
	arch_swap_restore(swap, folio);



	if (shmem_should_replace_folio(folio, gfp)) {

		error = shmem_replace_page(&page, gfp, info, index);

		folio = page_folio(page);

		error = shmem_replace_folio(&folio, gfp, info, index);

		if (error)

			goto failed;

	}