diff --git a/[refs] b/[refs] index 8fd25a44cf74..a6f2b7bb6229 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ad9500e16fe24aa55809a2b00e0d2d0e658fc71 +refs/heads/master: 66c4c35c6bc5a1a452b024cf0364635b28fd94e4 diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index 5b915e86a9b0..bc7a8af24f16 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -3937,13 +3937,14 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, if (kmem_cache_open(s, n, size, align, flags, ctor)) { list_add(&s->list, &slab_caches); + up_write(&slub_lock); if (sysfs_slab_add(s)) { + down_write(&slub_lock); list_del(&s->list); kfree(n); kfree(s); goto err; } - up_write(&slub_lock); return s; } kfree(n);