The quilt patch titled
Subject: shmem: convert shmem_fault() to use shmem_get_folio_gfp()
has been removed from the -mm tree. Its filename was
shmem-convert-shmem_fault-to-use-shmem_get_folio_gfp.patch
This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Matthew Wilcox (Oracle)" <willy@xxxxxxxxxxxxx>
Subject: shmem: convert shmem_fault() to use shmem_get_folio_gfp()
Date: Fri, 2 Sep 2022 20:46:18 +0100
No particular advantage for this function, but necessary to remove
shmem_getpage_gfp().
[hughd@xxxxxxxxxx: fix crash]
Link: https://lkml.kernel.org/r/7693a84-bdc2-27b5-2695-d0fe8566571f@xxxxxxxxxx
Link: https://lkml.kernel.org/r/20220902194653.1739778-23-willy@xxxxxxxxxxxxx
Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/shmem.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- a/mm/shmem.c~shmem-convert-shmem_fault-to-use-shmem_get_folio_gfp
+++ a/mm/shmem.c
@@ -2065,6 +2065,7 @@ static vm_fault_t shmem_fault(struct vm_
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_
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;
}
_
Patches currently in -mm which might be from willy@xxxxxxxxxxxxx are
