From c3e3e6393a1828dce0385baf4a4573cf84c5d4cb Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@parallels.com>
Date: Thu, 28 Oct 2010 13:50:37 +0400
Subject: [PATCH] --- yaml --- r: 227689 b: refs/heads/master c:
 98072e4d977aabe6a39abb95951cd8bf2c2202d5 h: refs/heads/master i:   227687:
 ad25efa919ee5545fac1dbc812af07cf57b1d824 v: v3

---
 [refs]          | 2 +-
 trunk/mm/slub.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 816d0e8eb3c0..7f906cf239e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 716ce5d4a6f81653507c21b152eb7629d150ce7a
+refs/heads/master: 98072e4d977aabe6a39abb95951cd8bf2c2202d5
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 7e657aa19475..7796a0446b3f 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -3289,9 +3289,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
@@ -3878,6 +3878,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");
 }