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 ab4d5ed (slub: Enable sysfs support for !CONFIG_SLUB_DEBUG) and 2bce648 ( slub: Allow removal of slab caches during boot). Acked-by: Christoph Lameter <[email protected]> Signed-off-by: Pavel Emelyanov <[email protected]> Signed-off-by: Pekka Enberg <[email protected]>
iegor · Nov 14, 2010 · 68cee4f · 68cee4f
1 parent c8ddb27
commit 68cee4f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/mm/slub.c b/mm/slub.c
@@ -3273,9 +3273,9 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
 		kfree(n);
 		kfree(s);
 	}
+err:
 	up_write(&slub_lock);
 
-err:
 	if (flags & SLAB_PANIC)
 		panic("Cannot create slabcache %s\n", name);
 	else
@@ -3862,6 +3862,7 @@ static ssize_t show_slab_objects(struct kmem_cache *s,
 			x += sprintf(buf + x, " N%d=%lu",
 					node, nodes[node]);
 #endif
+	up_read(&slub_lock);
 	kfree(nodes);
 	return x + sprintf(buf + x, "\n");
 }