On Wed, 22 Oct 2014, Thomas Gleixner wrote:
> That's not compiling at all due to the left over '}' !
Argh. Stale patch.
> And shouldn't you keep the stat(); call in that code path?
True. Fixed up patch follows:
Subject: slub: Remove __slab_alloc code duplication
Somehow the two branches in __slab_alloc do the same.
Unify them.
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Index: linux/mm/slub.c
===================================================================
--- linux.orig/mm/slub.c
+++ linux/mm/slub.c
@@ -2282,10 +2282,7 @@ redo:
if (unlikely(!node_match(page, searchnode))) {
stat(s, ALLOC_NODE_MISMATCH);
- deactivate_slab(s, page, c->freelist);
- c->page = NULL;
- c->freelist = NULL;
- goto new_slab;
+ goto deactivate;
}
}
@@ -2294,12 +2291,8 @@ redo:
* PFMEMALLOC but right now, we are losing the pfmemalloc
* information when the page leaves the per-cpu allocator
*/
- if (unlikely(!pfmemalloc_match(page, gfpflags))) {
- deactivate_slab(s, page, c->freelist);
- c->page = NULL;
- c->freelist = NULL;
- goto new_slab;
- }
+ if (unlikely(!pfmemalloc_match(page, gfpflags)))
+ goto deactivate;
/* must check again c->freelist in case of cpu migration or IRQ */
freelist = c->freelist;
@@ -2328,6 +2321,11 @@ load_freelist:
local_irq_restore(flags);
return freelist;
+deactivate:
+ deactivate_slab(s, page, c->freelist);
+ c->page = NULL;
+ c->freelist = NULL;
+
new_slab:
if (c->partial) {
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>