Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965264Ab3DQAiH (ORCPT ); Tue, 16 Apr 2013 20:38:07 -0400 Received: from e23smtp04.au.ibm.com ([202.81.31.146]:38735 "EHLO e23smtp04.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755130Ab3DQAgz (ORCPT ); Tue, 16 Apr 2013 20:36:55 -0400 From: Wanpeng Li To: Andrew Morton Cc: Andi Kleen , KAMEZAWA Hiroyuki , Michal Hocko , Mel Gorman , Rik van Riel , Hillf Danton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Wanpeng Li Subject: [PATCH v2 4/6] mm/hugetlb: use already exist huge_page_order() instead of h->order Date: Wed, 17 Apr 2013 08:36:32 +0800 Message-Id: <1366158995-3116-5-git-send-email-liwanp@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1366158995-3116-1-git-send-email-liwanp@linux.vnet.ibm.com> References: <1366158995-3116-1-git-send-email-liwanp@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13041700-9264-0000-0000-00000389EF9E Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5177 Lines: 161 Use already exist interface huge_page_order() instead of h->order to get huge page order. Signed-off-by: Wanpeng Li --- mm/hugetlb.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 328f140..0cae950 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -593,7 +593,8 @@ static void update_and_free_page(struct hstate *h, struct page *page) struct page *p; int order = huge_page_order(h); - VM_BUG_ON(!hugetlb_shrink_gigantic_pool && h->order >= MAX_ORDER); + VM_BUG_ON(!hugetlb_shrink_gigantic_pool && + huge_page_order(h) >= MAX_ORDER); h->nr_huge_pages--; h->nr_huge_pages_node[page_to_nid(page)]--; @@ -722,7 +723,7 @@ static struct page *alloc_fresh_huge_page_node(struct hstate *h, int nid) { struct page *page; - if (h->order >= MAX_ORDER) + if (huge_page_order(h) >= MAX_ORDER) return NULL; page = alloc_pages_exact_node(nid, @@ -876,7 +877,7 @@ static struct page *alloc_buddy_huge_page(struct hstate *h, int nid) struct page *page; unsigned int r_nid; - if (h->order >= MAX_ORDER) + if (huge_page_order(h) >= MAX_ORDER) return NULL; /* @@ -1071,7 +1072,7 @@ static void return_unused_surplus_pages(struct hstate *h, h->resv_huge_pages -= unused_resv_pages; /* Cannot return gigantic pages currently */ - if (h->order >= MAX_ORDER) + if (huge_page_order(h) >= MAX_ORDER) return; nr_pages = min(unused_resv_pages, h->surplus_huge_pages); @@ -1265,7 +1266,7 @@ static void __init gather_bootmem_prealloc(void) #endif __ClearPageReserved(page); WARN_ON(page_count(page) != 1); - prep_compound_huge_page(page, h->order); + prep_compound_huge_page(page, huge_page_order(h)); prep_new_huge_page(h, page, page_to_nid(page)); /* * If we had gigantic hugepages allocated at boot time, we need @@ -1273,8 +1274,8 @@ static void __init gather_bootmem_prealloc(void) * fix confusing memory reports from free(1) and another * side-effects, like CommitLimit going negative. */ - if (h->order > (MAX_ORDER - 1)) - totalram_pages += 1 << h->order; + if (huge_page_order(h) > (MAX_ORDER - 1)) + totalram_pages += 1 << huge_page_order(h); } } @@ -1283,7 +1284,7 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) unsigned long i; for (i = 0; i < h->max_huge_pages; ++i) { - if (h->order >= MAX_ORDER) { + if (huge_page_order(h) >= MAX_ORDER) { if (!alloc_bootmem_huge_page(h)) break; } else if (!alloc_fresh_huge_page(h, @@ -1299,7 +1300,7 @@ static void __init hugetlb_init_hstates(void) for_each_hstate(h) { /* oversize hugepages were init'ed in early boot */ - if (h->order < MAX_ORDER) + if (huge_page_order(h) < MAX_ORDER) hugetlb_hstate_alloc_pages(h); } } @@ -1333,7 +1334,7 @@ static void try_to_free_low(struct hstate *h, unsigned long count, { int i; - if (h->order >= MAX_ORDER) + if (huge_page_order(h) >= MAX_ORDER) return; for_each_node_mask(i, *nodes_allowed) { @@ -1416,8 +1417,8 @@ static unsigned long set_max_huge_pages(struct hstate *h, unsigned long count, { unsigned long min_count, ret; - if (h->order >= MAX_ORDER && (!hugetlb_shrink_gigantic_pool || - count > persistent_huge_pages(h))) + if (huge_page_order(h) >= MAX_ORDER && (!hugetlb_shrink_gigantic_pool + || count > persistent_huge_pages(h))) return h->max_huge_pages; /* @@ -1543,7 +1544,7 @@ static ssize_t nr_hugepages_store_common(bool obey_mempolicy, goto out; h = kobj_to_hstate(kobj, &nid); - if (h->order >= MAX_ORDER && !hugetlb_shrink_gigantic_pool) { + if (huge_page_order(h) >= MAX_ORDER && !hugetlb_shrink_gigantic_pool) { err = -EINVAL; goto out; } @@ -1626,7 +1627,7 @@ static ssize_t nr_overcommit_hugepages_store(struct kobject *kobj, unsigned long input; struct hstate *h = kobj_to_hstate(kobj, NULL); - if (h->order >= MAX_ORDER) + if (huge_page_order(h) >= MAX_ORDER) return -EINVAL; err = strict_strtoul(buf, 10, &input); @@ -2037,7 +2038,8 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy, tmp = h->max_huge_pages; - if (write && h->order >= MAX_ORDER && !hugetlb_shrink_gigantic_pool) + if (write && huge_page_order(h) >= MAX_ORDER && + !hugetlb_shrink_gigantic_pool) return -EINVAL; table->data = &tmp; @@ -2102,7 +2104,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write, tmp = h->nr_overcommit_huge_pages; - if (write && h->order >= MAX_ORDER) + if (write && huge_page_order(h) >= MAX_ORDER) return -EINVAL; table->data = &tmp; @@ -3093,7 +3095,7 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma, flush_tlb_range(vma, start, end); mutex_unlock(&vma->vm_file->f_mapping->i_mmap_mutex); - return pages << h->order; + return pages << huge_page_order(h); } int hugetlb_reserve_pages(struct inode *inode, -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/