slub: Simplify control flow in __slab_alloc()

Simplify control flow a bit avoiding nesting.

Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/mm/slub.c b/mm/slub.c
index 9892775..5aacd43 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2272,17 +2272,15 @@ new_slab:
        /* 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)) {
-                       if (!(gfpflags & __GFP_NOWARN) && printk_ratelimit())
-                               slab_out_of_memory(s, gfpflags, node);
+       if (unlikely(!freelist)) {
+               if (!(gfpflags & __GFP_NOWARN) && printk_ratelimit())
+                       slab_out_of_memory(s, gfpflags, node);
 
-                       local_irq_restore(flags);
-                       return NULL;
-               }
+               local_irq_restore(flags);
+               return NULL;
        }
 
        if (likely(!kmem_cache_debug(s)))