From patchwork Wed Apr 13 03:29:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Liu X-Patchwork-Id: 12811429 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5FFF7C433EF for ; Wed, 13 Apr 2022 03:11:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4B6966B0078; Tue, 12 Apr 2022 23:11:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4619F6B007B; Tue, 12 Apr 2022 23:11:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 302346B007D; Tue, 12 Apr 2022 23:11:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0235.hostedemail.com [216.40.44.235]) by kanga.kvack.org (Postfix) with ESMTP id 173A96B0078 for ; Tue, 12 Apr 2022 23:11:38 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id CAFBEA5BFD for ; Wed, 13 Apr 2022 03:11:37 +0000 (UTC) X-FDA: 79350380634.25.42E7937 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf18.hostedemail.com (Postfix) with ESMTP id 1CB8F1C0007 for ; Wed, 13 Apr 2022 03:11:36 +0000 (UTC) Received: from kwepemi100013.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4KdSKG74kmzfYng; Wed, 13 Apr 2022 11:10:58 +0800 (CST) Received: from kwepemm600017.china.huawei.com (7.193.23.234) by kwepemi100013.china.huawei.com (7.221.188.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 13 Apr 2022 11:11:34 +0800 Received: from localhost.localdomain (10.175.112.125) by kwepemm600017.china.huawei.com (7.193.23.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 13 Apr 2022 11:11:33 +0800 From: Peng Liu To: , , , , , , , , , Subject: [PATCH v3 4/4] hugetlb: Clean up hugetlb_cma_reserve Date: Wed, 13 Apr 2022 03:29:15 +0000 Message-ID: <20220413032915.251254-5-liupeng256@huawei.com> X-Mailer: git-send-email 2.18.0.huawei.25 In-Reply-To: <20220413032915.251254-1-liupeng256@huawei.com> References: <20220413032915.251254-1-liupeng256@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemm600017.china.huawei.com (7.193.23.234) X-CFilter-Loop: Reflected X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 1CB8F1C0007 X-Rspam-User: Authentication-Results: imf18.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf18.hostedemail.com: domain of liupeng256@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=liupeng256@huawei.com X-Stat-Signature: pozkqowm4nfinwijpeyoiqnjrnehctn8 X-HE-Tag: 1649819496-181501 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: Use more generic functions to deal with issues related to online nodes. The changes will make the code simplified. Signed-off-by: Peng Liu Reviewed-by: Muchun Song Reviewed-by: Baolin Wang Reviewed-by: Mike Kravetz Reviewed-by: Davidlohr Bueso Reviewed-by: David Hildenbrand --- mm/hugetlb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 2e4d8d9fb7c6..4c529774cc08 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6953,7 +6953,7 @@ void __init hugetlb_cma_reserve(int order) if (hugetlb_cma_size_in_node[nid] == 0) continue; - if (!node_state(nid, N_ONLINE)) { + if (!node_online(nid)) { pr_warn("hugetlb_cma: invalid node %d specified\n", nid); hugetlb_cma_size -= hugetlb_cma_size_in_node[nid]; hugetlb_cma_size_in_node[nid] = 0; @@ -6992,7 +6992,7 @@ void __init hugetlb_cma_reserve(int order) } reserved = 0; - for_each_node_state(nid, N_ONLINE) { + for_each_online_node(nid) { int res; char name[CMA_MAX_NAME];