[merged mm-stable] shmem-convert-shmem_get_partial_folio-to-use-shmem_get_folio.patch removed from -mm tree

[merged mm-stable] shmem-convert-shmem_get_partial_folio-to-use-shmem_get_folio.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: shmem: convert shmem_get_partial_folio() to use shmem_get_folio()
has been removed from the -mm tree.  Its filename was
     shmem-convert-shmem_get_partial_folio-to-use-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@infradead.org>
Subject: shmem: convert shmem_get_partial_folio() to use shmem_get_folio()
Date: Fri, 2 Sep 2022 20:46:21 +0100

Get rid of an unnecessary folio->page->folio conversion.

Link: https://lkml.kernel.org/r/20220902194653.1739778-26-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/shmem.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- a/mm/shmem.c~shmem-convert-shmem_get_partial_folio-to-use-shmem_get_folio
+++ a/mm/shmem.c
@@ -874,10 +874,9 @@ void shmem_unlock_mapping(struct address
 static struct folio *shmem_get_partial_folio(struct inode *inode, pgoff_t index)
 {
 	struct folio *folio;
-	struct page *page;
 
 	/*
-	 * At first avoid shmem_getpage(,,,SGP_READ): that fails
+	 * At first avoid shmem_get_folio(,,,SGP_READ): that fails
 	 * beyond i_size, and reports fallocated pages as holes.
 	 */
 	folio = __filemap_get_folio(inode->i_mapping, index,
@@ -888,9 +887,9 @@ static struct folio *shmem_get_partial_f
 	 * But read a page back from swap if any of it is within i_size
 	 * (although in some cases this is just a waste of time).
 	 */
-	page = NULL;
-	shmem_getpage(inode, index, &page, SGP_READ);
-	return page ? page_folio(page) : NULL;
+	folio = NULL;
+	shmem_get_folio(inode, index, &folio, SGP_READ);
+	return folio;
 }
 
 /*
_

Patches currently in -mm which might be from willy@infradead.org are