Re: [PATCH] slab: minor cleanup to kmem_cache_alloc_node

[Christoph Lameter <clameter@engr.sgi.com>]

On Mon, 21 Nov 2005, Pekka Enberg wrote:

> On Mon, 2005-11-21 at 09:21 -0800, Christoph Lameter wrote:
> > You could move the check for -1 into the section where interrupts are 
> > disabled.
> So we could do something like the following. Unfortunately it does not
> seem much of an improvement... Thoughts?

Remove the gotos. Something like this. It would be nice if we could remove 
the printk. Hmm....

Index: linux-2.6.15-rc1-mm2/mm/slab.c
===================================================================
--- linux-2.6.15-rc1-mm2.orig/mm/slab.c	2005-11-21 10:51:03.000000000 -0800
+++ linux-2.6.15-rc1-mm2/mm/slab.c	2005-11-21 11:43:31.000000000 -0800
@@ -2890,21 +2890,20 @@ void *kmem_cache_alloc_node(kmem_cache_t
 	unsigned long save_flags;
 	void *ptr;
 
-	if (nodeid == -1)
-		return __cache_alloc(cachep, flags);
+	cache_alloc_debugcheck_before(cachep, flags);
+	local_irq_save(save_flags);
 
-	if (unlikely(!cachep->nodelists[nodeid])) {
+	if (nodeid == -1 || nodeid == numa_node_id())
+		ptr = ____cache_alloc(cachep, flags);
+
+	else 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);
-	}
+		ptr =  ____cache_alloc(cachep,flags);
 
-	cache_alloc_debugcheck_before(cachep, flags);
-	local_irq_save(save_flags);
-	if (nodeid == numa_node_id())
-		ptr = ____cache_alloc(cachep, flags);
-	else
+	} 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));