From 2b3b75c19ec9353f819a9ddf683cf4aace1f4fb3 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <cl@linux.com>
Date: Fri, 15 Apr 2011 14:48:16 -0500
Subject: [PATCH] --- yaml --- r: 248621 b: refs/heads/master c:
 8dc16c6c04b1a82d00a8464ccc08e1fe17d0ff82 h: refs/heads/master i:   248619:
 984499756acbdbfc55b0111ba3696d2b37c168c9 v: v3

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

diff --git a/[refs] b/[refs]
index 2d193008b4dd..6e562fab30d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc1fb7f43636754a4d06f7bdb8ea3269a7d71d6d
+refs/heads/master: 8dc16c6c04b1a82d00a8464ccc08e1fe17d0ff82
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 301360bc00c6..c952fac112e8 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -2057,10 +2057,9 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
 	slab_lock(page);
 	stat(s, FREE_SLOWPATH);
 
-	if (kmem_cache_debug(s))
-		goto debug;
+	if (kmem_cache_debug(s) && !free_debug_processing(s, page, x, addr))
+		goto out_unlock;
 
-checks_ok:
 	prior = page->freelist;
 	set_freepointer(s, object, prior);
 	page->freelist = object;
@@ -2104,12 +2103,6 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
 #endif
 	stat(s, FREE_SLAB);
 	discard_slab(s, page);
-	return;
-
-debug:
-	if (!free_debug_processing(s, page, x, addr))
-		goto out_unlock;
-	goto checks_ok;
 }
 
 /*