The quilt patch titled
Subject: khugepaged: call shmem_get_folio()
has been removed from the -mm tree. Its filename was
khugepaged-call-shmem_get_folio.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: khugepaged: call shmem_get_folio()
Date: Fri, 2 Sep 2022 20:46:27 +0100
shmem_getpage() is being removed, so call its replacement and find the
precise page ourselves.
Link: https://lkml.kernel.org/r/20220902194653.1739778-32-willy@xxxxxxxxxxxxx
Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/khugepaged.c | 7 +++++--
mm/shmem.c | 4 ++--
2 files changed, 7 insertions(+), 4 deletions(-)
--- a/mm/khugepaged.c~khugepaged-call-shmem_get_folio
+++ a/mm/khugepaged.c
@@ -1647,13 +1647,16 @@ static int collapse_file(struct mm_struc
}
if (xa_is_value(page) || !PageUptodate(page)) {
+ struct folio *folio;
+
xas_unlock_irq(&xas);
/* swap in or instantiate fallocated page */
- if (shmem_getpage(mapping->host, index, &page,
- SGP_NOALLOC)) {
+ if (shmem_get_folio(mapping->host, index,
+ &folio, SGP_NOALLOC)) {
result = SCAN_FAIL;
goto xa_unlocked;
}
+ page = folio_file_page(folio, index);
} else if (trylock_page(page)) {
get_page(page);
xas_unlock_irq(&xas);
--- a/mm/shmem.c~khugepaged-call-shmem_get_folio
+++ a/mm/shmem.c
@@ -3158,7 +3158,7 @@ static const char *shmem_get_link(struct
folio = filemap_get_folio(inode->i_mapping, 0);
if (!folio)
return ERR_PTR(-ECHILD);
- if (PageHWPoison(&folio->page) ||
+ if (PageHWPoison(folio_page(folio, 0)) ||
!folio_test_uptodate(folio)) {
folio_put(folio);
return ERR_PTR(-ECHILD);
@@ -3169,7 +3169,7 @@ static const char *shmem_get_link(struct
return ERR_PTR(error);
if (!folio)
return ERR_PTR(-ECHILD);
- if (PageHWPoison(&folio->page)) {
+ if (PageHWPoison(folio_page(folio, 0))) {
folio_unlock(folio);
folio_put(folio);
return ERR_PTR(-ECHILD);
_
Patches currently in -mm which might be from willy@xxxxxxxxxxxxx are
