mm/sl[aou]b: Shrink __kmem_cache_create() parameter lists

[firefly-linux-kernel-4.4.55.git] / mm / slab_common.c

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 5374150f54866c5ae33e75354d9fc7a2d7c47e67..8a85a19d90ef4bc75304789466c52c8bb8add1c2 100644 (file)
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -108,16 +108,33 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, size_t align
                goto out_locked;
 
 
-       s = __kmem_cache_create(name, size, align, flags, ctor);
-       if (!s)
-               err = -ENOSYS; /* Until __kmem_cache_create returns code */
+       s = __kmem_cache_alias(name, size, align, flags, ctor);
+       if (s)
+               goto out_locked;
+
+       s = kmem_cache_zalloc(kmem_cache, GFP_KERNEL);
+       if (s) {
+               s->object_size = s->size = size;
+               s->align = align;
+               s->ctor = ctor;
+               s->name = kstrdup(name, GFP_KERNEL);
+               if (!s->name) {
+                       kmem_cache_free(kmem_cache, s);
+                       err = -ENOMEM;
+                       goto out_locked;
+               }
+
+               err = __kmem_cache_create(s, flags);
+               if (!err)
+
+                       list_add(&s->list, &slab_caches);
 
-       /*
-        * Check if the slab has actually been created and if it was a
-        * real instatiation. Aliases do not belong on the list
-        */
-       if (s && s->refcount == 1)
-               list_add(&s->list, &slab_caches);
+               else {
+                       kfree(s->name);
+                       kmem_cache_free(kmem_cache, s);
+               }
+       } else
+               err = -ENOMEM;
 
 out_locked:
        mutex_unlock(&slab_mutex);
@@ -137,6 +154,14 @@ out_locked:
                return NULL;
        }
 
+       if (s->refcount == 1) {
+               err = sysfs_slab_add(s);
+               if (err)
+                       printk(KERN_WARNING "kmem_cache_create(%s) failed to"
+                               " create sysfs entry. Error %d\n",
+                                       name, err);
+       }
+
        return s;
 }
 EXPORT_SYMBOL(kmem_cache_create);
@@ -153,7 +178,8 @@ void kmem_cache_destroy(struct kmem_cache *s)
                        if (s->flags & SLAB_DESTROY_BY_RCU)
                                rcu_barrier();
 
-                       __kmem_cache_destroy(s);
+                       kfree(s->name);
+                       kmem_cache_free(kmem_cache, s);
                } else {
                        list_add(&s->list, &slab_caches);
                        printk(KERN_ERR "kmem_cache_destroy %s: Slab cache still has objects\n",