drivers/net/ethernet/sis/sis900.c: fix error return code

[~andy/linux] / mm / slab_common.c

diff --git a/mm/slab_common.c b/mm/slab_common.c
index d6deae9108cdc23ef507fee1b18a2ec07c4faf1c..9c217255ac49374834689590f6e2bd9752e23da2 100644 (file)
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -108,16 +108,34 @@ 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) {
 
-       /*
-        * 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);
+                       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);
@@ -153,7 +171,7 @@ 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);