The freeing action is basically the same in all slab allocators.
Move to the common kmem_cache_destroy() function.
Reviewed-by: Joonsoo Kim <redacted>
Signed-off-by: Christoph Lameter <redacted>
---
mm/slab.c | 1 -
mm/slab_common.c | 1 +
mm/slob.c | 2 --
mm/slub.c | 2 --
4 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/mm/slab.c b/mm/slab.c
index 6365632..814cfc9 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2215,7 +2215,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 850c497..3e3c403 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 7d272c3..cb4ab96 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 607fee5..8da785a 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 = {--
1.7.9.5
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>