The quilt patch titled
Subject: shmem-convert-shmem_fault-to-use-shmem_get_folio_gfp-fix
has been removed from the -mm tree. Its filename was
shmem-convert-shmem_fault-to-use-shmem_get_folio_gfp-fix.patch
This patch was dropped because it was folded into shmem-convert-shmem_fault-to-use-shmem_get_folio_gfp.patch
------------------------------------------------------
From: Hugh Dickins <hughd@xxxxxxxxxx>
Subject: shmem-convert-shmem_fault-to-use-shmem_get_folio_gfp-fix
Date: Fri, 23 Sep 2022 17:14:38 -0700 (PDT)
Link: https://lkml.kernel.org/r/7693a84-bdc2-27b5-2695-d0fe8566571f@xxxxxxxxxx
Cc: Axel Rasmussen <axelrasmussen@xxxxxxxxxx>
Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Cc: Mike Kravetz <mike.kravetz@xxxxxxxxxx>
Cc: Muchun Song <songmuchun@xxxxxxxxxxxxx>
Cc: Nathan Chancellor <nathan@xxxxxxxxxx>
Cc: Nick Desaulniers <ndesaulniers@xxxxxxxxxx>
Cc: Peter Xu <peterx@xxxxxxxxxx>
Cc: Tom Rix <trix@xxxxxxxxxx>
Cc: Yang Shi <shy828301@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/shmem.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/mm/shmem.c~shmem-convert-shmem_fault-to-use-shmem_get_folio_gfp-fix
+++ a/mm/shmem.c
@@ -2065,7 +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;
+ struct folio *folio = NULL;
int err;
vm_fault_t ret = VM_FAULT_LOCKED;
@@ -2132,7 +2132,8 @@ static vm_fault_t shmem_fault(struct vm_
gfp, vma, vmf, &ret);
if (err)
return vmf_error(err);
- vmf->page = folio_file_page(folio, vmf->pgoff);
+ if (folio)
+ vmf->page = folio_file_page(folio, vmf->pgoff);
return ret;
}
_
Patches currently in -mm which might be from hughd@xxxxxxxxxx are
shmem-convert-shmem_fault-to-use-shmem_get_folio_gfp.patch
