diff options
author | Pavel Emelyanov <xemul@parallels.com> | 2010-10-28 05:50:37 -0400 |
---|---|---|
committer | Pekka Enberg <penberg@kernel.org> | 2010-11-06 03:04:33 -0400 |
commit | 98072e4d977aabe6a39abb95951cd8bf2c2202d5 (patch) | |
tree | a4bbecec358e8ef295ac6df3e626a16218f2d98d /mm/slub.c | |
parent | 716ce5d4a6f81653507c21b152eb7629d150ce7a (diff) |
slub: Fix slub_lock down/up imbalance
There are two places, that do not release the slub_lock.
Respective bugs were introduced by sysfs changes ab4d5ed5 (slub: Enable
sysfs support for !CONFIG_SLUB_DEBUG) and 2bce6485 ( slub: Allow removal
of slab caches during boot).
Acked-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Diffstat (limited to 'mm/slub.c')
-rw-r--r-- | mm/slub.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -3289,9 +3289,9 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, | |||
3289 | kfree(n); | 3289 | kfree(n); |
3290 | kfree(s); | 3290 | kfree(s); |
3291 | } | 3291 | } |
3292 | err: | ||
3292 | up_write(&slub_lock); | 3293 | up_write(&slub_lock); |
3293 | 3294 | ||
3294 | err: | ||
3295 | if (flags & SLAB_PANIC) | 3295 | if (flags & SLAB_PANIC) |
3296 | panic("Cannot create slabcache %s\n", name); | 3296 | panic("Cannot create slabcache %s\n", name); |
3297 | else | 3297 | else |
@@ -3878,6 +3878,7 @@ static ssize_t show_slab_objects(struct kmem_cache *s, | |||
3878 | x += sprintf(buf + x, " N%d=%lu", | 3878 | x += sprintf(buf + x, " N%d=%lu", |
3879 | node, nodes[node]); | 3879 | node, nodes[node]); |
3880 | #endif | 3880 | #endif |
3881 | up_read(&slub_lock); | ||
3881 | kfree(nodes); | 3882 | kfree(nodes); |
3882 | return x + sprintf(buf + x, "\n"); | 3883 | return x + sprintf(buf + x, "\n"); |
3883 | } | 3884 | } |