[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-mm
Subject:    [PATCH] shmem: Update folio if shmem_replace_page() updates the page
From:       "Matthew Wilcox (Oracle)" <willy () infradead ! org>
Date:       2022-07-30 4:25:18
Message-ID: 20220730042518.1264767-1-willy () infradead ! org
[Download RAW message or body]

If we allocate a new page, we need to make sure that our folio matches
that new page.  This will be solved by changing shmem_replace_page()
to shmem_replace_folio(), but this is the minimal fix.

Fixes: da08e9b79323 ("mm/shmem: convert shmem_swapin_page() to shmem_swapin_folio()")
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 mm/shmem.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mm/shmem.c b/mm/shmem.c
index a6f565308133..bcc0a3c7b5bf 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1771,6 +1771,7 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index,
 
 	if (shmem_should_replace_folio(folio, gfp)) {
 		error = shmem_replace_page(&page, gfp, info, index);
+		folio = page_folio(page);
 		if (error)
 			goto failed;
 	}
-- 
2.35.1


[prev in list] [next in list] [prev in thread] [next in thread]