Merge branch 'slab/common-for-cgroups' into slab/for-linus

Fix up a trivial conflict with NUMA_NO_NODE cleanups.

Conflicts:
	mm/slob.c

Signed-off-by: Pekka Enberg <penberg@kernel.org>

1 files changed, 76 insertions, 4 deletions

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 8cf8b4962d6c..9c217255ac49 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -22,6 +22,7 @@
 enum slab_state slab_state;
 LIST_HEAD(slab_caches);
 DEFINE_MUTEX(slab_mutex);
+struct kmem_cache *kmem_cache;
 
 #ifdef CONFIG_DEBUG_VM
 static int kmem_cache_sanity_check(const char *name, size_t size)
@@ -98,21 +99,92 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, size_t align
                 unsigned long flags, void (*ctor)(void *))
 {
         struct kmem_cache *s = NULL;
+        int err = 0;
 
         get_online_cpus();
         mutex_lock(&slab_mutex);
-        if (kmem_cache_sanity_check(name, size) == 0)
-                s = __kmem_cache_create(name, size, align, flags, ctor);
+
+        if (!kmem_cache_sanity_check(name, size) == 0)
+                goto out_locked;
+
+
+        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) {
+
+                        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);
         put_online_cpus();
 
-        if (!s && (flags & SLAB_PANIC))
-                panic("kmem_cache_create: Failed to create slab '%s'\n", name);
+        if (err) {
+
+                if (flags & SLAB_PANIC)
+                        panic("kmem_cache_create: Failed to create slab '%s'. Error %d\n",
+                                name, err);
+                else {
+                        printk(KERN_WARNING "kmem_cache_create(%s) failed with error %d",
+                                name, err);
+                        dump_stack();
+                }
+
+                return NULL;
+        }
 
         return s;
 }
 EXPORT_SYMBOL(kmem_cache_create);
 
+void kmem_cache_destroy(struct kmem_cache *s)
+{
+        get_online_cpus();
+        mutex_lock(&slab_mutex);
+        s->refcount--;
+        if (!s->refcount) {
+                list_del(&s->list);
+
+                if (!__kmem_cache_shutdown(s)) {
+                        if (s->flags & SLAB_DESTROY_BY_RCU)
+                                rcu_barrier();
+
+                        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",
+                                s->name);
+                        dump_stack();
+                }
+        }
+        mutex_unlock(&slab_mutex);
+        put_online_cpus();
+}
+EXPORT_SYMBOL(kmem_cache_destroy);
+
 int slab_is_available(void)
 {
         return slab_state >= UP;