mm: use for_each_online_node and node_online instead of open coding

Use more generic functions to deal with issues related to online nodes.
The changes will make the code simplified.

Link: https://lkml.kernel.org/r/20220429030218.644635-1-liupeng256@huawei.com
Signed-off-by: Peng Liu <liupeng256@huawei.com>
Suggested-by: Davidlohr Bueso <dave@stgolabs.net>
Suggested-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Muchun Song <songmuchun@bytedance.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/ia64/kernel/uncached.c b/arch/ia64/kernel/uncached.c
index 816803636a754e71d7494010e1943cfe242ee9b0..a0fec82c56b88e4b9281a32248f6dd67d515a557 100644 (file)
--- a/arch/ia64/kernel/uncached.c
+++ b/arch/ia64/kernel/uncached.c
@@ -261,7 +261,7 @@ static int __init uncached_init(void)
 {
        int nid;
 
-       for_each_node_state(nid, N_ONLINE) {
+       for_each_online_node(nid) {
                uncached_pools[nid].pool = gen_pool_create(PAGE_SHIFT, nid);
                mutex_init(&uncached_pools[nid].add_chunk_mutex);
        }

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 15b9faeb87efab7a6e9fa8098cc732f72ce38b44..4ab62657acda4a35c4b5d9a471a316f6ac5f3dcf 100644 (file)
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -6971,7 +6971,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;
@@ -7010,7 +7010,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];
 

diff --git a/mm/page_ext.c b/mm/page_ext.c
index 2e66d934d63f2f25fce2c6a5c32d67e3c58d8608..3dc715d7ac29ed5703150ea3813ef9b4bf750d5b 100644 (file)
--- a/mm/page_ext.c
+++ b/mm/page_ext.c
@@ -320,7 +320,7 @@ static int __meminit online_page_ext(unsigned long start_pfn,
                 * online__pages(), and start_pfn should exist.
                 */
                nid = pfn_to_nid(start_pfn);
-               VM_BUG_ON(!node_state(nid, N_ONLINE));
+               VM_BUG_ON(!node_online(nid));
        }
 
        for (pfn = start; !fail && pfn < end; pfn += PAGES_PER_SECTION)