mm, sl[aou]b: Move kmem_cache_create mutex handling to common code

Move the mutex handling into the common kmem_cache_create()
function.

Then we can also move more checks out of SLAB's kmem_cache_create()
into the common code.

Reviewed-by: Glauber Costa <glommer@parallels.com>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

1 files changed, 13 insertions, 15 deletions

diff --git a/mm/slub.c b/mm/slub.c
index 8c4fd37541d7..0e0504ed6ff1 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3911,7 +3911,6 @@ struct kmem_cache *__kmem_cache_create(const char *name, size_t size,
         struct kmem_cache *s;
         char *n;
 
-        mutex_lock(&slab_mutex);
         s = find_mergeable(size, align, flags, name, ctor);
         if (s) {
                 s->refcount++;
@@ -3924,37 +3923,36 @@ struct kmem_cache *__kmem_cache_create(const char *name, size_t size,
 
                 if (sysfs_slab_alias(s, name)) {
                         s->refcount--;
-                        goto err;
+                        return NULL;
                 }
-                mutex_unlock(&slab_mutex);
                 return s;
         }
 
         n = kstrdup(name, GFP_KERNEL);
         if (!n)
-                goto err;
+                return NULL;
 
         s = kmalloc(kmem_size, GFP_KERNEL);
         if (s) {
                 if (kmem_cache_open(s, n,
                                 size, align, flags, ctor)) {
+                        int r;
+
                         list_add(&s->list, &slab_caches);
                         mutex_unlock(&slab_mutex);
-                        if (sysfs_slab_add(s)) {
-                                mutex_lock(&slab_mutex);
-                                list_del(&s->list);
-                                kfree(n);
-                                kfree(s);
-                                goto err;
-                        }
-                        return s;
+                        r = sysfs_slab_add(s);
+                        mutex_lock(&slab_mutex);
+
+                        if (!r)
+                                return s;
+
+                        list_del(&s->list);
+                        kmem_cache_close(s);
                 }
                 kfree(s);
         }
         kfree(n);
-err:
-        mutex_unlock(&slab_mutex);
-        return s;
+        return NULL;
 }
 
 #ifdef CONFIG_SMP