summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2011-05-12 13:10:49 -0700
committerPekka Enberg <penberg@kernel.org>2011-05-17 22:19:00 +0300
commitbd07d87fd4b8a6af9820544b6bc6c37215d6f8ad (patch)
tree521042275e3bf152056b5683f637f5750ccf9edb /mm
parent1393d9a1857471f816d0be1ccc1d6433a86050f6 (diff)
downloadop-kernel-dev-bd07d87fd4b8a6af9820544b6bc6c37215d6f8ad.zip
op-kernel-dev-bd07d87fd4b8a6af9820544b6bc6c37215d6f8ad.tar.gz
slub: avoid label inside conditional
Jumping to a label inside a conditional is considered poor style, especially considering the current organization of __slab_alloc(). This removes the 'load_from_page' label and just duplicates the three lines of code that it uses: c->node = page_to_nid(page); c->page = page; goto load_freelist; since it's probably not worth making this a separate helper function. Acked-by: Christoph Lameter <cl@linux.com> Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Pekka Enberg <penberg@kernel.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/slub.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/slub.c b/mm/slub.c
index 97bb5b8..9f7bb93 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1845,7 +1845,6 @@ new_slab:
page = get_partial(s, gfpflags, node);
if (page) {
stat(s, ALLOC_FROM_PARTIAL);
-load_from_page:
c->node = page_to_nid(page);
c->page = page;
goto load_freelist;
@@ -1868,8 +1867,9 @@ load_from_page:
slab_lock(page);
__SetPageSlubFrozen(page);
-
- goto load_from_page;
+ c->node = page_to_nid(page);
+ c->page = page;
+ goto load_freelist;
}
if (!(gfpflags & __GFP_NOWARN) && printk_ratelimit())
slab_out_of_memory(s, gfpflags, node);
OpenPOWER on IntegriCloud