From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Thu, 26 Jul 2007 18:54:34 +0000 (+0200)
Subject: slub: fix bug in slub debug support
X-Git-Tag: v2.6.23-rc2~152^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2208b764c14d0f1ad63da64b1a42db6077b6fe42;p=linux-2.6-omap-h63xx.git

slub: fix bug in slub debug support

We ClearSlabDebug() before the last SlabDebug() check. Clear it later.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Christoph Lameter <clameter@sgi.com>
---

diff --git a/mm/slub.c b/mm/slub.c
index 221809f1c13..6c6d74ff069 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1131,6 +1131,7 @@ static void __free_slab(struct kmem_cache *s, struct page *page)
 		slab_pad_check(s, page);
 		for_each_object(p, s, page_address(page))
 			check_object(s, page, p, 0);
+		ClearSlabDebug(page);
 	}
 
 	mod_zone_page_state(page_zone(page),
@@ -1169,7 +1170,6 @@ static void discard_slab(struct kmem_cache *s, struct page *page)
 
 	atomic_long_dec(&n->nr_slabs);
 	reset_page_mapcount(page);
-	ClearSlabDebug(page);
 	__ClearPageSlab(page);
 	free_slab(s, page);
 }