[slubllv4 13/16] slub: Get rid of the another_slab label

Christoph Lameter
2011-05-06T18:07:13Z

[-- Attachment #1: eliminate_another_slab --]
[-- Type: text/plain, Size: 1150 bytes --]

We can avoid deactivate slab in special cases if we do the
deactivation of slabs in each code flow that leads to new_slab.

Signed-off-by: Christoph Lameter <cl@linux.com>

---
mm/slub.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)

Index: linux-2.6/mm/slub.c
===================================================================
--- linux-2.6.orig/mm/slub.c 2011-05-06 12:55:42.000000000 -0500
+++ linux-2.6/mm/slub.c 2011-05-06 12:56:13.000000000 -0500
@@ -1928,8 +1928,10 @@ static void *__slab_alloc(struct kmem_ca
if (!page)
goto new_slab;

- if (unlikely(!node_match(c, node)))
- goto another_slab;
+ if (unlikely(!node_match(c, node))) {
+ deactivate_slab(s, c);
+ goto new_slab;
+ }

stat(s, ALLOC_REFILL);

@@ -1954,7 +1956,7 @@ load_freelist:
VM_BUG_ON(!page->frozen);

if (unlikely(!object))
- goto another_slab;
+ goto new_slab;

c->freelist = get_freepointer(s, object);
c->tid = next_tid(c->tid);
@@ -1962,9 +1964,6 @@ load_freelist:
stat(s, ALLOC_SLOWPATH);
return object;

-another_slab:
- deactivate_slab(s, c);
-
new_slab:
page = get_partial(s, gfpflags, node);
if (page) {