[PATCH] slab: minor cleanup to kmem_cache_alloc_node

Clean up kmem_cache_alloc_node a bit.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Acked-by: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/mm/slab.c b/mm/slab.c
index 1a014aaf4491463c1360fffb6f1e6935ff551b8c..bb7a9837b9491edbdccd112e637c05b18d22a617 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2928,27 +2928,18 @@ void *kmem_cache_alloc_node(kmem_cache_t *cachep, gfp_t flags, int nodeid)
        unsigned 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));
+
+       ptr = cache_alloc_debugcheck_after(cachep, flags, ptr,
+                                          __builtin_return_address(0));
 
        return ptr;
 }