UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2022-09-02 20:46:14 +01:00 committed by Andrew Morton
parent 7a7256d5f5
commit 0d698e2572
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mm/shmem.c
View File

@ -1608,7 +1608,7 @@ static bool shmem_should_replace_folio(struct folio *folio, gfp_t gfp)
return folio_zonenum(folio) > gfp_zone(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 shmem_inode_info *info, pgoff_t index)
{ {
struct folio *old, *new; struct folio *old, *new;
@ -1617,7 +1617,7 @@ static int shmem_replace_page(struct page **pagep, gfp_t gfp,
pgoff_t swap_index; pgoff_t swap_index;
int error; int error;
old = page_folio(*pagep); old = *foliop;
entry = folio_swap_entry(old); entry = folio_swap_entry(old);
swap_index = swp_offset(entry); swap_index = swp_offset(entry);
swap_mapping = swap_address_space(entry); swap_mapping = swap_address_space(entry);
@ -1666,7 +1666,7 @@ static int shmem_replace_page(struct page **pagep, gfp_t gfp,
old = new; old = new;
} else { } else {
folio_add_lru(new); folio_add_lru(new);
*pagep = &new->page; *foliop = new;
} }
folio_clear_swapcache(old); folio_clear_swapcache(old);
@ -1772,8 +1772,7 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index,
arch_swap_restore(swap, folio); arch_swap_restore(swap, folio);
if (shmem_should_replace_folio(folio, gfp)) { if (shmem_should_replace_folio(folio, gfp)) {
error = shmem_replace_page(&page, gfp, info, index); error = shmem_replace_folio(&folio, gfp, info, index);
folio = page_folio(page);
if (error) if (error)
goto failed; goto failed;
} }