mm/sl[aou]b: Move kmem_cache allocations into common code

Shift the allocations to common code. That way the allocation and
freeing of the kmem_cache structures is handled by 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, 17 insertions, 25 deletions

diff --git a/mm/slob.c b/mm/slob.c
index 50f605322700..9b0cee1e8475 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -508,34 +508,26 @@ size_t ksize(const void *block)
 }
 EXPORT_SYMBOL(ksize);
 
-struct kmem_cache *__kmem_cache_create(const char *name, size_t size,
+int __kmem_cache_create(struct kmem_cache *c, const char *name, size_t size,
         size_t align, unsigned long flags, void (*ctor)(void *))
 {
-        struct kmem_cache *c;
-
-        c = slob_alloc(sizeof(struct kmem_cache),
-                GFP_KERNEL, ARCH_KMALLOC_MINALIGN, -1);
-
-        if (c) {
-                c->name = name;
-                c->size = size;
-                if (flags & SLAB_DESTROY_BY_RCU) {
-                        /* leave room for rcu footer at the end of object */
-                        c->size += sizeof(struct slob_rcu);
-                }
-                c->flags = flags;
-                c->ctor = ctor;
-                /* ignore alignment unless it's forced */
-                c->align = (flags & SLAB_HWCACHE_ALIGN) ? SLOB_ALIGN : 0;
-                if (c->align < ARCH_SLAB_MINALIGN)
-                        c->align = ARCH_SLAB_MINALIGN;
-                if (c->align < align)
-                        c->align = align;
-
-                kmemleak_alloc(c, sizeof(struct kmem_cache), 1, GFP_KERNEL);
-                c->refcount = 1;
+        c->name = name;
+        c->size = size;
+        if (flags & SLAB_DESTROY_BY_RCU) {
+                /* leave room for rcu footer at the end of object */
+                c->size += sizeof(struct slob_rcu);
         }
-        return c;
+        c->flags = flags;
+        c->ctor = ctor;
+        /* ignore alignment unless it's forced */
+        c->align = (flags & SLAB_HWCACHE_ALIGN) ? SLOB_ALIGN : 0;
+        if (c->align < ARCH_SLAB_MINALIGN)
+                c->align = ARCH_SLAB_MINALIGN;
+        if (c->align < align)
+                c->align = align;
+
+        c->refcount = 1;
+        return 0;
 }
 
 void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)