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

Do the initial settings of the fields in common code. This will allow us
to push more processing into common code later and improve readability.

Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

1 files changed, 18 insertions, 21 deletions

diff --git a/mm/slub.c b/mm/slub.c
index 0ad3fffc7d2..d8ee419d5a1 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3029,16 +3029,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
 
 }
 
-static int kmem_cache_open(struct kmem_cache *s,
-                const char *name, size_t size,
-                size_t align, unsigned long flags,
-                void (*ctor)(void *))
+static int kmem_cache_open(struct kmem_cache *s, unsigned long flags)
 {
-        s->name = name;
-        s->ctor = ctor;
-        s->object_size = size;
-        s->align = align;
-        s->flags = kmem_cache_flags(size, flags, name, ctor);
+        s->flags = kmem_cache_flags(s->size, flags, s->name, s->ctor);
         s->reserved = 0;
 
         if (need_reserve_slab_rcu && (s->flags & SLAB_DESTROY_BY_RCU))
@@ -3115,7 +3108,7 @@ error:
         if (flags & SLAB_PANIC)
                 panic("Cannot create slab %s size=%lu realsize=%u "
                         "order=%u offset=%u flags=%lx\n",
-                        s->name, (unsigned long)size, s->size, oo_order(s->oo),
+                        s->name, (unsigned long)s->size, s->size, oo_order(s->oo),
                         s->offset, flags);
         return -EINVAL;
 }
@@ -3261,12 +3254,15 @@ static struct kmem_cache *__init create_kmalloc_cache(const char *name,
 
         s = kmem_cache_zalloc(kmem_cache, GFP_NOWAIT);
 
+        s->name = name;
+        s->size = s->object_size = size;
+        s->align = ARCH_KMALLOC_MINALIGN;
+
         /*
          * This function is called with IRQs disabled during early-boot on
          * single CPU so there's no need to take slab_mutex here.
          */
-        if (kmem_cache_open(s, name, size, ARCH_KMALLOC_MINALIGN,
-                                                                flags, NULL))
+        if (kmem_cache_open(s, flags))
                 goto panic;
 
         list_add(&s->list, &slab_caches);
@@ -3719,9 +3715,10 @@ void __init kmem_cache_init(void)
          */
         kmem_cache_node = (void *)kmem_cache + kmalloc_size;
 
-        kmem_cache_open(kmem_cache_node, "kmem_cache_node",
-                sizeof(struct kmem_cache_node),
-                0, SLAB_HWCACHE_ALIGN | SLAB_PANIC, NULL);
+        kmem_cache_node->name = "kmem_cache_node";
+        kmem_cache_node->size = kmem_cache_node->object_size =
+                sizeof(struct kmem_cache_node);
+        kmem_cache_open(kmem_cache_node, SLAB_HWCACHE_ALIGN | SLAB_PANIC);
 
         hotplug_memory_notifier(slab_memory_callback, SLAB_CALLBACK_PRI);
 
@@ -3729,8 +3726,10 @@ void __init kmem_cache_init(void)
         slab_state = PARTIAL;
 
         temp_kmem_cache = kmem_cache;
-        kmem_cache_open(kmem_cache, "kmem_cache", kmem_size,
-                0, SLAB_HWCACHE_ALIGN | SLAB_PANIC, NULL);
+        kmem_cache->name = "kmem_cache";
+        kmem_cache->size = kmem_cache->object_size = kmem_size;
+        kmem_cache_open(kmem_cache, SLAB_HWCACHE_ALIGN | SLAB_PANIC);
+
         kmem_cache = kmem_cache_alloc(kmem_cache, GFP_NOWAIT);
         memcpy(kmem_cache, temp_kmem_cache, kmem_size);
 
@@ -3943,11 +3942,9 @@ struct kmem_cache *__kmem_cache_alias(const char *name, size_t size,
         return s;
 }
 
-int __kmem_cache_create(struct kmem_cache *s,
-                const char *name, size_t size,
-                size_t align, unsigned long flags, void (*ctor)(void *))
+int __kmem_cache_create(struct kmem_cache *s, unsigned long flags)
 {
-        return kmem_cache_open(s, name, size, align, flags, ctor);
+        return kmem_cache_open(s, flags);
 }
 
 #ifdef CONFIG_SMP