pagecache_get_page() can return subpage for us if we do not specify
FGP_HEAD. No functional change intended.

Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
 mm/swap_state.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/mm/swap_state.c b/mm/swap_state.c
index ee67164531c0..517b4b856e32 100644
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -394,13 +394,10 @@ struct page *find_get_incore_page(struct address_space *mapping, pgoff_t index)
 {
 	swp_entry_t swp;
 	struct swap_info_struct *si;
-	struct page *page = pagecache_get_page(mapping, index,
-						FGP_ENTRY | FGP_HEAD, 0);
+	struct page *page = pagecache_get_page(mapping, index, FGP_ENTRY, 0);
 
-	if (!page)
+	if (!page || !xa_is_value(page))
 		return page;
-	if (!xa_is_value(page))
-		return find_subpage(page, index);
 	if (!shmem_mapping(mapping))
 		return NULL;
 
-- 
2.23.0

On Wed, Mar 16, 2022 at 03:59:41PM +0800, Miaohe Lin wrote:
> pagecache_get_page() can return subpage for us if we do not specify
> FGP_HEAD. No functional change intended.

No, I'm converting this to folios soon.

On 2022/3/16 20:25, Matthew Wilcox wrote:
> On Wed, Mar 16, 2022 at 03:59:41PM +0800, Miaohe Lin wrote:
>> pagecache_get_page() can return subpage for us if we do not specify
>> FGP_HEAD. No functional change intended.
> 
> No, I'm converting this to folios soon.

This patch is based on linux-next-20220315 where pagecache_get_page is already
converted to folios. What you mean is find_get_incore_page will convert to folis
too soon? I'll continue to delay this patch anyway.

Thanks.

> 
> .
>