slab: minor cleanup to kmem_cache_alloc_node
PATCH 2/9 slab: minor cleanup to kmem_cache_alloc_node
From: Christoph Lameter <[email protected]>
This patch cleans up kmem_cache_alloc_node a bit.
Signed-off-by Christoph Lameter <[email protected]>
Acked-by Manfred Spraul <[email protected]>
Signed-off-by Pekka Enberg <[email protected]>
---
mm/slab.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
mm/slab.c +3 -10
@@ -2872,21 +2872,14 @@ void *kmem_cache_alloc_node(kmem_cache_tunsigned long save_flags;void *ptr; -if (nodeid ==-1 ) -return __cache_alloc (cachep, flags); - -if (unlikely (!cachep->nodelists[nodeid])) { -/* Fall back to __cache_alloc if we run into trouble */ -printk (KERN_WARNING "slab: not allocating in inactive node %d for cache %s\n" , nodeid, cachep->name); -return __cache_alloc (cachep,flags); - } -cache_alloc_debugcheck_before (cachep, flags);local_irq_save (save_flags); -if (nodeid ==numa_node_id ()) + +if (nodeid ==-1 || nodeid ==numa_node_id () || !cachep->nodelists[nodeid]) ptr =____cache_alloc (cachep, flags);else ptr =__cache_alloc_node (cachep, flags, nodeid); +local_irq_restore (save_flags); ptr =cache_alloc_debugcheck_after (cachep, flags, ptr,__builtin_return_address (0 ));
--