Commit a7f5862c authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton

shmem: convert shmem_get_partial_folio() to use shmem_get_folio()

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

Link: https://lkml.kernel.org/r/20220902194653.1739778-26-willy@infradead.orgSigned-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 4e1fc793
...@@ -874,10 +874,9 @@ void shmem_unlock_mapping(struct address_space *mapping) ...@@ -874,10 +874,9 @@ void shmem_unlock_mapping(struct address_space *mapping)
static struct folio *shmem_get_partial_folio(struct inode *inode, pgoff_t index) static struct folio *shmem_get_partial_folio(struct inode *inode, pgoff_t index)
{ {
struct folio *folio; 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. * beyond i_size, and reports fallocated pages as holes.
*/ */
folio = __filemap_get_folio(inode->i_mapping, index, folio = __filemap_get_folio(inode->i_mapping, index,
...@@ -888,9 +887,9 @@ static struct folio *shmem_get_partial_folio(struct inode *inode, pgoff_t index) ...@@ -888,9 +887,9 @@ static struct folio *shmem_get_partial_folio(struct inode *inode, pgoff_t index)
* But read a page back from swap if any of it is within i_size * 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). * (although in some cases this is just a waste of time).
*/ */
page = NULL; folio = NULL;
shmem_getpage(inode, index, &page, SGP_READ); shmem_get_folio(inode, index, &folio, SGP_READ);
return page ? page_folio(page) : NULL; return folio;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment