mm/slab_common.c: cleanup

Eliminate an ifdef and a label by moving all the CONFIG_DEBUG_VM checking
inside the locked region.

Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/mm/slab_common.c b/mm/slab_common.c
index aa3ca5bb01b55a097f1397a6a92728f81b3167a5..281600b30100bf21d6a43d813f5d53995a27019d 100644 (file)
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -53,19 +53,17 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, size_t align
 {
        struct kmem_cache *s = NULL;
 
+       get_online_cpus();
+       mutex_lock(&slab_mutex);
+
 #ifdef CONFIG_DEBUG_VM
        if (!name || in_interrupt() || size < sizeof(void *) ||
                size > KMALLOC_MAX_SIZE) {
                printk(KERN_ERR "kmem_cache_create(%s) integrity check"
-                       " failed\n", name);
-               goto out;
+                               " failed\n", name);
+               goto oops;
        }
-#endif
-
-       get_online_cpus();
-       mutex_lock(&slab_mutex);
 
-#ifdef CONFIG_DEBUG_VM
        list_for_each_entry(s, &slab_caches, list) {
                char tmp;
                int res;
@@ -104,9 +102,6 @@ oops:
        mutex_unlock(&slab_mutex);
        put_online_cpus();
 
-#ifdef CONFIG_DEBUG_VM
-out:
-#endif
        if (!s && (flags & SLAB_PANIC))
                panic("kmem_cache_create: Failed to create slab '%s'\n", name);