Commit 455ce9eb authored by Andrew Morton's avatar Andrew Morton Committed by Pekka Enberg

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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
parent 48f24741
...@@ -53,19 +53,17 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, size_t align ...@@ -53,19 +53,17 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, size_t align
{ {
struct kmem_cache *s = NULL; struct kmem_cache *s = NULL;
get_online_cpus();
mutex_lock(&slab_mutex);
#ifdef CONFIG_DEBUG_VM #ifdef CONFIG_DEBUG_VM
if (!name || in_interrupt() || size < sizeof(void *) || if (!name || in_interrupt() || size < sizeof(void *) ||
size > KMALLOC_MAX_SIZE) { size > KMALLOC_MAX_SIZE) {
printk(KERN_ERR "kmem_cache_create(%s) integrity check" printk(KERN_ERR "kmem_cache_create(%s) integrity check"
" failed\n", name); " failed\n", name);
goto out; goto oops;
} }
#endif
get_online_cpus();
mutex_lock(&slab_mutex);
#ifdef CONFIG_DEBUG_VM
list_for_each_entry(s, &slab_caches, list) { list_for_each_entry(s, &slab_caches, list) {
char tmp; char tmp;
int res; int res;
...@@ -104,9 +102,6 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, size_t align ...@@ -104,9 +102,6 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, size_t align
mutex_unlock(&slab_mutex); mutex_unlock(&slab_mutex);
put_online_cpus(); put_online_cpus();
#ifdef CONFIG_DEBUG_VM
out:
#endif
if (!s && (flags & SLAB_PANIC)) if (!s && (flags & SLAB_PANIC))
panic("kmem_cache_create: Failed to create slab '%s'\n", name); panic("kmem_cache_create: Failed to create slab '%s'\n", name);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment