From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx191.postini.com [74.125.245.191]) by kanga.kvack.org (Postfix) with SMTP id 7C6936B0069 for ; Thu, 9 Aug 2012 09:57:51 -0400 (EDT) Message-Id: <20120809135634.798366335@linux.com> Date: Thu, 09 Aug 2012 08:56:31 -0500 From: Christoph Lameter Subject: Common11r [08/20] Move freeing of kmem_cache structure to common code References: <20120809135623.574621297@linux.com> Content-Disposition: inline; filename=common_kmem_cache_destroy Sender: owner-linux-mm@kvack.org List-ID: To: Joonsoo Kim Cc: Glauber Costa , Pekka Enberg , linux-mm@kvack.org, David Rientjes The freeing action is basically the same in all slab allocators. Move to the common kmem_cache_destroy() function. Reviewed-by: Joonsoo Kim Signed-off-by: Christoph Lameter --- mm/slab.c | 1 - mm/slab_common.c | 1 + mm/slob.c | 2 -- mm/slub.c | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) Index: linux-2.6/mm/slab_common.c =================================================================== --- linux-2.6.orig/mm/slab_common.c 2012-08-03 09:02:43.432389623 -0500 +++ linux-2.6/mm/slab_common.c 2012-08-03 09:02:44.064400579 -0500 @@ -144,6 +144,7 @@ void kmem_cache_destroy(struct kmem_cach 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", Index: linux-2.6/mm/slob.c =================================================================== --- linux-2.6.orig/mm/slob.c 2012-08-03 09:02:43.436389695 -0500 +++ linux-2.6/mm/slob.c 2012-08-03 09:02:44.064400579 -0500 @@ -540,8 +540,6 @@ struct kmem_cache *__kmem_cache_create(c 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) Index: linux-2.6/mm/slab.c =================================================================== --- linux-2.6.orig/mm/slab.c 2012-08-03 09:02:43.432389623 -0500 +++ linux-2.6/mm/slab.c 2012-08-03 09:02:44.064400579 -0500 @@ -2222,7 +2222,6 @@ void __kmem_cache_destroy(struct kmem_ca kfree(l3); } } - kmem_cache_free(kmem_cache, cachep); } Index: linux-2.6/mm/slub.c =================================================================== --- linux-2.6.orig/mm/slub.c 2012-08-03 09:02:43.436389695 -0500 +++ linux-2.6/mm/slub.c 2012-08-03 09:02:44.064400579 -0500 @@ -213,7 +213,6 @@ static inline int sysfs_slab_alias(struc static inline void sysfs_slab_remove(struct kmem_cache *s) { kfree(s->name); - kmem_cache_free(kmem_cache, s); } #endif @@ -5199,7 +5198,6 @@ static void kmem_cache_release(struct ko struct kmem_cache *s = to_slab(kobj); kfree(s->name); - kmem_cache_free(kmem_cache, s); } static const struct sysfs_ops slab_sysfs_ops = { -- 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: email@kvack.org