---

yaml --- r: 330437 b: refs/heads/master c: 8f4c765 h: refs/heads/master i: 330435: 35f00a0 v: v3
git-mirror · Sep 5, 2012 · 4fe0581 · 4fe0581
1 parent 9eb6ea3
commit 4fe0581
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b030cb865f137e1574596983face2a07e41e8b2
+refs/heads/master: 8f4c765c22deee766319ae9a1db68325f14816e6
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
@@ -2225,7 +2225,6 @@ void __kmem_cache_destroy(struct kmem_cache *cachep)
 			kfree(l3);
 		}
 	}
-	kmem_cache_free(kmem_cache, cachep);
 }
 
 

diff --git a/trunk/mm/slab_common.c b/trunk/mm/slab_common.c
@@ -154,6 +154,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
 				rcu_barrier();
 
 			__kmem_cache_destroy(s);
+			kmem_cache_free(kmem_cache, s);
 		} else {
 			list_add(&s->list, &slab_caches);
 			printk(KERN_ERR "kmem_cache_destroy %s: Slab cache still has objects\n",

diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c
@@ -540,8 +540,6 @@ struct kmem_cache *__kmem_cache_create(const char *name, size_t size,
 
 void __kmem_cache_destroy(struct kmem_cache *c)
 {
-	kmemleak_free(c);
-	slob_free(c, sizeof(struct kmem_cache));
 }
 
 void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)

diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
@@ -213,7 +213,6 @@ static inline int sysfs_slab_alias(struct kmem_cache *s, const char *p)
 static inline void sysfs_slab_remove(struct kmem_cache *s)
 {
 	kfree(s->name);
-	kmem_cache_free(kmem_cache, s);
 }
 
 #endif
@@ -5206,7 +5205,6 @@ static void kmem_cache_release(struct kobject *kobj)
 	struct kmem_cache *s = to_slab(kobj);
 
 	kfree(s->name);
-	kmem_cache_free(kmem_cache, s);
 }
 
 static const struct sysfs_ops slab_sysfs_ops = {
-Original file line number
+Diff line change
@@ Expand Up / @@ -2225,7 +2225,6 @@ void __kmem_cache_destroy(struct kmem_cache *cachep) @@
     			kfree(l3);
     		}
     	}
-    	kmem_cache_free(kmem_cache, cachep);
     }
@@ Expand Down @@