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

shmem: add shmem_get_folio() 

With no remaining callers of shmem_getpage_gfp(), add shmem_get_folio()
and reimplement shmem_getpage() as a call to shmem_get_folio().

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


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

include/linux/shmem_fs.h

+2 −0
Original line number Diff line number Diff line
@@ -113,6 +113,8 @@ enum sgp_type { 


extern int shmem_getpage(struct inode *inode, pgoff_t index,

		struct page **pagep, enum sgp_type sgp);

int shmem_get_folio(struct inode *inode, pgoff_t index, struct folio **foliop,

		enum sgp_type sgp);



static inline struct page *shmem_read_mapping_page(

				struct address_space *mapping, pgoff_t index)

mm/shmem.c

+10 −13
Original line number Diff line number Diff line
@@ -2025,14 +2025,18 @@ static int shmem_get_folio_gfp(struct inode *inode, pgoff_t index, 
	return error;

}



static int shmem_getpage_gfp(struct inode *inode, pgoff_t index,

		struct page **pagep, enum sgp_type sgp,

		gfp_t gfp, struct vm_area_struct *vma,

		struct vm_fault *vmf, vm_fault_t *fault_type)

int shmem_get_folio(struct inode *inode, pgoff_t index, struct folio **foliop,

		enum sgp_type sgp)

{

	return shmem_get_folio_gfp(inode, index, foliop, sgp,

			mapping_gfp_mask(inode->i_mapping), NULL, NULL, NULL);

}



int shmem_getpage(struct inode *inode, pgoff_t index,

		struct page **pagep, enum sgp_type sgp)

{

	struct folio *folio = NULL;

	int ret = shmem_get_folio_gfp(inode, index, &folio, sgp, gfp, vma,

			vmf, fault_type);

	int ret = shmem_get_folio(inode, index, &folio, sgp);



	if (folio)

		*pagep = folio_file_page(folio, index);
@@ -2041,13 +2045,6 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index, 
	return ret;

}



int shmem_getpage(struct inode *inode, pgoff_t index,

		struct page **pagep, enum sgp_type sgp)

{

	return shmem_getpage_gfp(inode, index, pagep, sgp,

		mapping_gfp_mask(inode->i_mapping), NULL, NULL, NULL);

}



/*

 * This is like autoremove_wake_function, but it removes the wait queue

 * entry unconditionally - even if something else had already woken the