Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750736AbVKUVSD (ORCPT ); Mon, 21 Nov 2005 16:18:03 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750700AbVKUVSD (ORCPT ); Mon, 21 Nov 2005 16:18:03 -0500 Received: from omx1-ext.sgi.com ([192.48.179.11]:63175 "EHLO omx1.americas.sgi.com") by vger.kernel.org with ESMTP id S1750736AbVKUVSA (ORCPT ); Mon, 21 Nov 2005 16:18:00 -0500 Date: Mon, 21 Nov 2005 13:17:41 -0800 (PST) From: Christoph Lameter To: Pekka Enberg cc: akpm@osdl.org, linux-kernel@vger.kernel.org, manfred@colorfullife.com, Joe Perches Subject: Re: [PATCH] slab: minor cleanup to kmem_cache_alloc_node In-Reply-To: <1132607272.19332.7.camel@localhost> Message-ID: References: <1132598194.8972.4.camel@localhost> <1132607272.19332.7.camel@localhost> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1792 Lines: 49 On Mon, 21 Nov 2005, Pekka Enberg wrote: > Hi, > > On Mon, 2005-11-21 at 11:47 -0800, Christoph Lameter wrote: > > Remove the gotos. Something like this. It would be nice if we could remove > > the printk. Hmm.... > > Definite improvement to my patch. I think I like Joe's suggestion > better, though. (Any mistakes in the following are mine.) If we drop the printk then this may be even simpler Signed-off-by: Christoph Lameter Index: linux-2.6.15-rc1-mm2/mm/slab.c =================================================================== --- linux-2.6.15-rc1-mm2.orig/mm/slab.c 2005-11-21 13:16:07.000000000 -0800 +++ linux-2.6.15-rc1-mm2/mm/slab.c 2005-11-21 13:16:59.000000000 -0800 @@ -2890,21 +2890,14 @@ void *kmem_cache_alloc_node(kmem_cache_t 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)); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/