From patchwork Tue May 18 13:53:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaohe Lin X-Patchwork-Id: 12264847 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DBB81C43460 for ; Tue, 18 May 2021 13:54:04 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 76EAC61285 for ; Tue, 18 May 2021 13:54:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 76EAC61285 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id DE6A56B0125; Tue, 18 May 2021 09:54:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D96956B0128; Tue, 18 May 2021 09:54:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C5EC36B0129; Tue, 18 May 2021 09:54:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0031.hostedemail.com [216.40.44.31]) by kanga.kvack.org (Postfix) with ESMTP id 9689E6B0125 for ; Tue, 18 May 2021 09:54:03 -0400 (EDT) Received: from smtpin39.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 301415850 for ; Tue, 18 May 2021 13:54:03 +0000 (UTC) X-FDA: 78154495566.39.6AFB637 Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) by imf07.hostedemail.com (Postfix) with ESMTP id 7D414A000187 for ; Tue, 18 May 2021 13:54:00 +0000 (UTC) Received: from dggems702-chm.china.huawei.com (unknown [172.30.72.58]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4Fky7V67MgzqVCQ; Tue, 18 May 2021 21:50:30 +0800 (CST) Received: from dggeme703-chm.china.huawei.com (10.1.199.99) by dggems702-chm.china.huawei.com (10.3.19.179) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2176.2; Tue, 18 May 2021 21:53:59 +0800 Received: from huawei.com (10.175.104.170) by dggeme703-chm.china.huawei.com (10.1.199.99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Tue, 18 May 2021 21:53:58 +0800 From: Miaohe Lin To: CC: , , Subject: [PATCH 5/5] mm/swap: simplify the code of find_get_incore_page() Date: Tue, 18 May 2021 21:53:52 +0800 Message-ID: <20210518135352.3705306-6-linmiaohe@huawei.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210518135352.3705306-1-linmiaohe@huawei.com> References: <20210518135352.3705306-1-linmiaohe@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.104.170] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggeme703-chm.china.huawei.com (10.1.199.99) X-CFilter-Loop: Reflected Authentication-Results: imf07.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=huawei.com; spf=pass (imf07.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.190 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com X-Stat-Signature: k8ycwaxecy9ajrmt9519w977n6p4kb5q X-Rspamd-Queue-Id: 7D414A000187 X-Rspamd-Server: rspam02 X-HE-Tag: 1621346040-932023 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000019, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: pagecache_get_page() can do find_subpage() for us if we do not specify FGP_HEAD. No functional change intended. Signed-off-by: Miaohe Lin --- mm/swap_state.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mm/swap_state.c b/mm/swap_state.c index a55b7b74b0e6..bc92e4893fec 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -394,13 +394,11 @@ 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;