From: Christoph Lameter <cl@linux.com>
To: Pekka Enberg <penberg@kernel.org>
Cc: linux-mm@kvack.org, David Rientjes <rientjes@google.com>,
Matt Mackall <mpm@selenic.com>,
Glauber Costa <glommer@parallels.com>,
Joonsoo Kim <js1304@gmail.com>
Subject: Common [6/9] Move freeing of kmem_cache structure to common code
Date: Tue, 31 Jul 2012 12:36:26 -0500 [thread overview]
Message-ID: <20120731173636.957620874@linux.com> (raw)
In-Reply-To: 20120731173620.432853182@linux.com
[-- Attachment #1: common_kmem_cache_destroy --]
[-- Type: text/plain, Size: 2300 bytes --]
The freeing action is basically the same in all slab allocators.
Move to the common kmem_cache_destroy() function.
Reviewed-by: Joonsoo Kim <js1304@gmail.com>
Signed-off-by: Christoph Lameter <cl@linux.com>
---
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-07-31 12:20:08.035649028 -0500
+++ linux-2.6/mm/slab_common.c 2012-07-31 12:20:10.139685656 -0500
@@ -135,6 +135,7 @@
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-07-31 12:20:08.027648887 -0500
+++ linux-2.6/mm/slob.c 2012-07-31 12:20:10.139685656 -0500
@@ -540,8 +540,6 @@
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-07-31 12:20:08.019648748 -0500
+++ linux-2.6/mm/slab.c 2012-07-31 12:20:10.143685717 -0500
@@ -2064,7 +2064,6 @@
kfree(l3);
}
}
- kmem_cache_free(kmem_cache, cachep);
}
Index: linux-2.6/mm/slub.c
===================================================================
--- linux-2.6.orig/mm/slub.c 2012-07-31 12:20:08.047649236 -0500
+++ linux-2.6/mm/slub.c 2012-07-31 12:20:37.228157295 -0500
@@ -211,7 +211,6 @@
static inline void sysfs_slab_remove(struct kmem_cache *s)
{
kfree(s->name);
- kfree(s);
}
#endif
@@ -5301,7 +5300,6 @@
kobject_del(&s->kobj);
kobject_put(&s->kobj);
kfree(s->name);
- kmem_cache_free(kmem_cache, s);
}
/*
--
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>
next prev parent reply other threads:[~2012-07-31 17:36 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-31 17:36 Common [0/9] Sl[auo]b: Common code rework V7 Christoph Lameter
2012-07-31 17:36 ` Common [1/9] slub: Add debugging to verify correct cache use on kmem_cache_free() Christoph Lameter
2012-07-31 17:36 ` Common [2/9] slub: Use kmem_cache for the kmem_cache structure Christoph Lameter
2012-08-01 8:42 ` Glauber Costa
2012-08-01 18:05 ` Christoph Lameter
2012-07-31 17:36 ` Common [3/9] Move list_add() to slab_common.c Christoph Lameter
2012-07-31 17:36 ` Common [4/9] Extract a common function for kmem_cache_destroy Christoph Lameter
2012-07-31 17:36 ` Common [5/9] Always use the name "kmem_cache" for the slab cache with the kmem_cache structure Christoph Lameter
2012-07-31 17:36 ` Christoph Lameter [this message]
2012-07-31 17:36 ` Common [7/9] Get rid of __kmem_cache_destroy Christoph Lameter
2012-07-31 17:36 ` Common [8/9] Move duping of slab name to slab_common.c Christoph Lameter
2012-07-31 18:02 ` Christoph Lameter
2012-07-31 17:36 ` Common [9/9] Do slab aliasing call from common code Christoph Lameter
2012-08-02 7:24 ` Glauber Costa
2012-08-02 13:57 ` Christoph Lameter
2012-08-02 13:58 ` Glauber Costa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120731173636.957620874@linux.com \
--to=cl@linux.com \
--cc=glommer@parallels.com \
--cc=js1304@gmail.com \
--cc=linux-mm@kvack.org \
--cc=mpm@selenic.com \
--cc=penberg@kernel.org \
--cc=rientjes@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.