From nobody Mon Jun 22 21:35:19 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3328EC433EF for ; Wed, 16 Mar 2022 08:00:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354385AbiCPIBy (ORCPT ); Wed, 16 Mar 2022 04:01:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244787AbiCPIBw (ORCPT ); Wed, 16 Mar 2022 04:01:52 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1920C5C354 for ; Wed, 16 Mar 2022 01:00:38 -0700 (PDT) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4KJN2h4CnHzfZ1t; Wed, 16 Mar 2022 15:59:08 +0800 (CST) Received: from huawei.com (10.175.124.27) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Wed, 16 Mar 2022 16:00:36 +0800 From: Miaohe Lin To: CC: , , Subject: [PATCH] mm/swap: simplify the code of find_get_incore_page() Date: Wed, 16 Mar 2022 15:59:41 +0800 Message-ID: <20220316075941.44816-1-linmiaohe@huawei.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" pagecache_get_page() can return subpage for us if we do not specify FGP_HEAD. No functional change intended. Signed-off-by: Miaohe Lin --- 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_spac= e *mapping, pgoff_t index) { swp_entry_t swp; struct swap_info_struct *si; - struct page *page =3D pagecache_get_page(mapping, index, - FGP_ENTRY | FGP_HEAD, 0); + struct page *page =3D pagecache_get_page(mapping, index, FGP_ENTRY, 0); =20 - 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; =20 --=20 2.23.0