From: Joonsoo Kim <iamjoonsoo.kim@lge.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Rik van Riel <riel@redhat.com>, Mel Gorman <mgorman@suse.de>,
Michal Hocko <mhocko@suse.cz>,
"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
Hugh Dickins <hughd@google.com>,
Davidlohr Bueso <davidlohr.bueso@hp.com>,
David Gibson <david@gibson.dropbear.id.au>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Joonsoo Kim <js1304@gmail.com>,
Joonsoo Kim <iamjoonsoo.kim@lge.com>
Subject: [PATCH v2 04/10] mm, hugetlb: clean-up alloc_huge_page()
Date: Mon, 22 Jul 2013 17:36:25 +0900 [thread overview]
Message-ID: <1374482191-3500-5-git-send-email-iamjoonsoo.kim@lge.com> (raw)
In-Reply-To: <1374482191-3500-1-git-send-email-iamjoonsoo.kim@lge.com>
We can unify some codes for succeed allocation.
This makes code more readable.
There is no functional difference.
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index d21a33a..83edd17 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1146,12 +1146,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) {
@@ -1162,11 +1157,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
next prev parent reply other threads:[~2013-07-22 8:40 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-22 8:36 [PATCH v2 00/10] mm, hugetlb: clean-up and possible bug fix Joonsoo Kim
2013-07-22 8:36 ` [PATCH v2 01/10] mm, hugetlb: move up the code which check availability of free huge page Joonsoo Kim
2013-07-22 15:45 ` Aneesh Kumar K.V
2013-07-22 8:36 ` [PATCH v2 02/10] mm, hugetlb: remove err label in dequeue_huge_page_vma() Joonsoo Kim
2013-07-22 16:11 ` Michal Hocko
2013-07-23 7:27 ` Joonsoo Kim
2013-07-22 8:36 ` [PATCH v2 03/10] mm, hugetlb: trivial commenting fix Joonsoo Kim
[not found] ` <51ef274e.0605e00a.246a.ffffa5c9SMTPIN_ADDED_BROKEN@mx.google.com>
2013-07-24 8:52 ` Joonsoo Kim
2013-07-22 8:36 ` Joonsoo Kim [this message]
2013-07-22 8:36 ` [PATCH v2 05/10] mm, hugetlb: fix and clean-up node iteration code to alloc or free Joonsoo Kim
2013-07-22 15:50 ` Aneesh Kumar K.V
2013-07-22 16:23 ` Michal Hocko
2013-07-23 1:05 ` Aneesh Kumar K.V
2013-07-22 8:36 ` [PATCH v2 06/10] mm, hugetlb: remove redundant list_empty check in gather_surplus_pages() Joonsoo Kim
2013-07-22 8:36 ` [PATCH v2 07/10] mm, hugetlb: do not use a page in page cache for cow optimization Joonsoo Kim
2013-07-23 4:26 ` Naoya Horiguchi
2013-07-23 11:45 ` Michal Hocko
2013-07-24 8:51 ` Joonsoo Kim
2013-07-22 8:36 ` [PATCH v2 08/10] mm, hugetlb: add VM_NORESERVE check in vma_has_reserves() Joonsoo Kim
2013-07-23 13:23 ` Michal Hocko
2013-07-22 8:36 ` [PATCH v2 09/10] mm, hugetlb: remove decrement_hugepage_resv_vma() Joonsoo Kim
2013-07-22 8:36 ` [PATCH v2 10/10] mm, hugetlb: decrement reserve count if VM_NORESERVE alloc page cache Joonsoo Kim
2013-07-23 13:37 ` Michal Hocko
2013-07-22 15:51 ` [PATCH v2 00/10] mm, hugetlb: clean-up and possible bug fix Aneesh Kumar K.V
2013-07-23 7:31 ` Joonsoo Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1374482191-3500-5-git-send-email-iamjoonsoo.kim@lge.com \
--to=iamjoonsoo.kim@lge.com \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=david@gibson.dropbear.id.au \
--cc=davidlohr.bueso@hp.com \
--cc=hughd@google.com \
--cc=js1304@gmail.com \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@suse.de \
--cc=mhocko@suse.cz \
--cc=riel@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).