Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18f820f6 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[PATCH] slab: minor cleanup to kmem_cache_alloc_node 



Clean up kmem_cache_alloc_node a bit.

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Acked-by: default avatarManfred Spraul <manfred@colorfullife.com>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3dafccf2

mm/slab.c

+6 −15
Original line number Original line Diff line number Diff line
@@ -2928,26 +2928,17 @@ void *kmem_cache_alloc_node(kmem_cache_t *cachep, gfp_t flags, int nodeid) 
	unsigned long save_flags;

	unsigned long save_flags;

	void *ptr;

	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);

	cache_alloc_debugcheck_before(cachep, flags);

	local_irq_save(save_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);

		ptr = ____cache_alloc(cachep, flags);

	else

	else

		ptr = __cache_alloc_node(cachep, flags, nodeid);

		ptr = __cache_alloc_node(cachep, flags, nodeid);

	local_irq_restore(save_flags);

	local_irq_restore(save_flags);

	ptr =



	    cache_alloc_debugcheck_after(cachep, flags, ptr,

	ptr = cache_alloc_debugcheck_after(cachep, flags, ptr,

					   __builtin_return_address(0));

					   __builtin_return_address(0));





	return ptr;

	return ptr;