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

mm/shmem: add shmem_alloc_folio() 

Call vma_alloc_folio() directly instead of alloc_page_vma().  Add a
shmem_alloc_page() wrapper to avoid changing the callers.

Link: https://lkml.kernel.org/r/20220504182857.4013401-21-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 069d849c

mm/shmem.c

+10 −4
Original line number Diff line number Diff line
@@ -1544,17 +1544,23 @@ static struct page *shmem_alloc_hugepage(gfp_t gfp, 
	return &folio->page;

}



static struct page *shmem_alloc_page(gfp_t gfp,

static struct folio *shmem_alloc_folio(gfp_t gfp,

			struct shmem_inode_info *info, pgoff_t index)

{

	struct vm_area_struct pvma;

	struct page *page;

	struct folio *folio;



	shmem_pseudo_vma_init(&pvma, info, index);

	page = alloc_page_vma(gfp, &pvma, 0);

	folio = vma_alloc_folio(gfp, 0, &pvma, 0, false);

	shmem_pseudo_vma_destroy(&pvma);



	return page;

	return folio;

}



static struct page *shmem_alloc_page(gfp_t gfp,

			struct shmem_inode_info *info, pgoff_t index)

{

	return &shmem_alloc_folio(gfp, info, index)->page;

}



static struct page *shmem_alloc_and_acct_page(gfp_t gfp,