From mboxrd@z Thu Jan 1 00:00:00 1970 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=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 EFB75C43461 for ; Thu, 17 Sep 2020 11:47:00 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6647A208DB for ; Thu, 17 Sep 2020 11:47:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6647A208DB Authentication-Results: mail.kernel.org; dmarc=none (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 E5EFE6B0003; Thu, 17 Sep 2020 07:46:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E0EE36B0037; Thu, 17 Sep 2020 07:46:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D24C06B0055; Thu, 17 Sep 2020 07:46:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0055.hostedemail.com [216.40.44.55]) by kanga.kvack.org (Postfix) with ESMTP id B90696B0003 for ; Thu, 17 Sep 2020 07:46:59 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 79E47181AEF1D for ; Thu, 17 Sep 2020 11:46:59 +0000 (UTC) X-FDA: 77272376958.11.plot31_610314827122 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id 49CF5180F8B80 for ; Thu, 17 Sep 2020 11:46:59 +0000 (UTC) X-HE-Tag: plot31_610314827122 X-Filterd-Recvd-Size: 2100 Received: from huawei.com (szxga05-in.huawei.com [45.249.212.191]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Thu, 17 Sep 2020 11:46:58 +0000 (UTC) Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 9018B256F03204D11C74; Thu, 17 Sep 2020 19:46:55 +0800 (CST) Received: from huawei.com (10.175.104.175) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.487.0; Thu, 17 Sep 2020 19:46:49 +0800 From: Miaohe Lin To: CC: , , Subject: [PATCH] mm: avoid possible multiple call to swap_node() Date: Thu, 17 Sep 2020 07:44:49 -0400 Message-ID: <20200917114449.35285-1-linmiaohe@huawei.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.104.175] X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: 49CF5180F8B80 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Cache the swap_node() in a local variable to avoid possible multiple call to swap_node(), though compiler may do this for us. Signed-off-by: Miaohe Lin --- mm/swapfile.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 20012c0c0252..cd66b50f0490 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -2454,7 +2454,7 @@ static void setup_swap_info(struct swap_info_struct= *p, int prio, unsigned char *swap_map, struct swap_cluster_info *cluster_info) { - int i; + int i, node; =20 if (prio >=3D 0) p->prio =3D prio; @@ -2465,11 +2465,12 @@ static void setup_swap_info(struct swap_info_stru= ct *p, int prio, * low-to-high, while swap ordering is high-to-low */ p->list.prio =3D -p->prio; + node =3D swap_node(p); for_each_node(i) { if (p->prio >=3D 0) p->avail_lists[i].prio =3D -p->prio; else { - if (swap_node(p) =3D=3D i) + if (node =3D=3D i) p->avail_lists[i].prio =3D 1; else p->avail_lists[i].prio =3D -p->prio; --=20 2.19.1