Commit f4697436 authored by Christoph Lameter's avatar Christoph Lameter Committed by Pekka Enberg
Browse files

slub: Simplify control flow in __slab_alloc() 



Simplify control flow a bit avoiding nesting.

Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
parent 7ced3719

mm/slub.c

+6 −8
Original line number Diff line number Diff line
@@ -2272,8 +2272,7 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, 
	/* Then do expensive stuff like retrieving pages from the partial lists */

	freelist = get_partial(s, gfpflags, node, c);



	if (unlikely(!freelist)) {



	if (!freelist)

		freelist = new_slab_objects(s, gfpflags, node, &c);



	if (unlikely(!freelist)) {
@@ -2283,7 +2282,6 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, 
		local_irq_restore(flags);

		return NULL;

	}

	}



	if (likely(!kmem_cache_debug(s)))

		goto load_freelist;