Messages in this thread Patch in this message | | | Subject | Re: [PATCH] slab: minor cleanup to kmem_cache_alloc_node | From | Pekka Enberg <> | Date | Mon, 21 Nov 2005 23:07:52 +0200 |
| |
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.)
Pekka
Index: 2.6/mm/slab.c =================================================================== --- 2.6.orig/mm/slab.c +++ 2.6/mm/slab.c @@ -2866,21 +2866,16 @@ 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()) ptr = ____cache_alloc(cachep, flags); - else + else if (likely(cachep->nodelists[nodeid])) ptr = __cache_alloc_node(cachep, flags, nodeid); + else + ptr = ____cache_alloc(cachep, flags); + 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/
| |