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

shmem: convert shmem_fault() to use shmem_get_folio_gfp() 

No particular advantage for this function, but necessary to remove
shmem_getpage_gfp().

[hughd@google.com: fix crash]
  Link: https://lkml.kernel.org/r/7693a84-bdc2-27b5-2695-d0fe8566571f@google.com
Link: https://lkml.kernel.org/r/20220902194653.1739778-23-willy@infradead.org


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

mm/shmem.c

+4 −1
Original line number Diff line number Diff line
@@ -2065,6 +2065,7 @@ static vm_fault_t shmem_fault(struct vm_fault *vmf) 
	struct vm_area_struct *vma = vmf->vma;

	struct inode *inode = file_inode(vma->vm_file);

	gfp_t gfp = mapping_gfp_mask(inode->i_mapping);

	struct folio *folio = NULL;

	int err;

	vm_fault_t ret = VM_FAULT_LOCKED;
@@ -2127,10 +2128,12 @@ static vm_fault_t shmem_fault(struct vm_fault *vmf) 
		spin_unlock(&inode->i_lock);

	}



	err = shmem_getpage_gfp(inode, vmf->pgoff, &vmf->page, SGP_CACHE,

	err = shmem_get_folio_gfp(inode, vmf->pgoff, &folio, SGP_CACHE,

				  gfp, vma, vmf, &ret);

	if (err)

		return vmf_error(err);

	if (folio)

		vmf->page = folio_file_page(folio, vmf->pgoff);

	return ret;

}