From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx102.postini.com [74.125.245.102]) by kanga.kvack.org (Postfix) with SMTP id E9B746B0031 for ; Mon, 29 Jul 2013 05:20:40 -0400 (EDT) Received: by mail-oa0-f43.google.com with SMTP id i10so7393970oag.30 for ; Mon, 29 Jul 2013 02:20:40 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <1375075701-5998-4-git-send-email-iamjoonsoo.kim@lge.com> References: <1375075701-5998-1-git-send-email-iamjoonsoo.kim@lge.com> <1375075701-5998-4-git-send-email-iamjoonsoo.kim@lge.com> Date: Mon, 29 Jul 2013 17:20:39 +0800 Message-ID: Subject: Re: [PATCH v3 3/9] mm, hugetlb: clean-up alloc_huge_page() From: Hillf Danton Content-Type: text/plain; charset=UTF-8 Sender: owner-linux-mm@kvack.org List-ID: To: Joonsoo Kim Cc: Andrew Morton , Rik van Riel , Mel Gorman , Michal Hocko , "Aneesh Kumar K.V" , KAMEZAWA Hiroyuki , Hugh Dickins , Davidlohr Bueso , David Gibson , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Joonsoo Kim , Wanpeng Li , Naoya Horiguchi On Mon, Jul 29, 2013 at 1:28 PM, Joonsoo Kim wrote: > This patch unifies successful allocation paths to make the code more > readable. There are no functional changes. > > Acked-by: Michal Hocko > Reviewed-by: Wanpeng Li > Reviewed-by: Aneesh Kumar K.V > Signed-off-by: Joonsoo Kim > Acked-by: Hillf Danton > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 51564a8..31d78c5 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -1149,12 +1149,7 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma, > } > spin_lock(&hugetlb_lock); > page = dequeue_huge_page_vma(h, vma, addr, avoid_reserve); > - if (page) { > - /* update page cgroup details */ > - hugetlb_cgroup_commit_charge(idx, pages_per_huge_page(h), > - h_cg, page); > - spin_unlock(&hugetlb_lock); > - } else { > + if (!page) { > spin_unlock(&hugetlb_lock); > page = alloc_buddy_huge_page(h, NUMA_NO_NODE); > if (!page) { > @@ -1165,11 +1160,11 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma, > return ERR_PTR(-ENOSPC); > } > spin_lock(&hugetlb_lock); > - hugetlb_cgroup_commit_charge(idx, pages_per_huge_page(h), > - h_cg, page); > list_move(&page->lru, &h->hugepage_activelist); > - spin_unlock(&hugetlb_lock); > + /* Fall through */ > } > + hugetlb_cgroup_commit_charge(idx, pages_per_huge_page(h), h_cg, page); > + spin_unlock(&hugetlb_lock); > > set_page_private(page, (unsigned long)spool); > > -- > 1.7.9.5 > -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org