summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorChristoph Lameter <cl@linux.com>2012-09-05 00:18:32 +0000
committerPekka Enberg <penberg@kernel.org>2012-09-05 12:00:36 +0300
commit8f4c765c22deee766319ae9a1db68325f14816e6 (patch)
treea0208ba9890f61fd02150a29b7b465b306fb62d7 /mm
parent9b030cb865f137e1574596983face2a07e41e8b2 (diff)
downloadlinux-8f4c765c22deee766319ae9a1db68325f14816e6.tar.bz2
mm/sl[aou]b: Move freeing of kmem_cache structure to common code
The freeing action is basically the same in all slab allocators. Move to the common kmem_cache_destroy() function. Reviewed-by: Glauber Costa <glommer@parallels.com> Reviewed-by: Joonsoo Kim <js1304@gmail.com> Signed-off-by: Christoph Lameter <cl@linux.com> Signed-off-by: Pekka Enberg <penberg@kernel.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/slab.c1
-rw-r--r--mm/slab_common.c1
-rw-r--r--mm/slob.c2
-rw-r--r--mm/slub.c2
4 files changed, 1 insertions, 5 deletions
diff --git a/mm/slab.c b/mm/slab.c
index ef94799a1aa5..8ca6ec6301fa 100644
--- a/mm/slab.c
+++ b/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/mm/slab_common.c b/mm/slab_common.c
index 5374150f5486..d6deae9108cd 100644
--- a/mm/slab_common.c
+++ b/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/mm/slob.c b/mm/slob.c
index 7d272c3dcc08..cb4ab9675293 100644
--- a/mm/slob.c
+++ b/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/mm/slub.c b/mm/slub.c
index e0d1e0470309..6f932f7a8219 100644
--- a/mm/slub.c
+++ b/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 = {