Get rid of the refcount stuff in the allocators and do that
part of kmem_cache management in the common code.
Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
---
mm/slab.c | 1 -
mm/slab_common.c | 5 +++--
mm/slob.c | 2 --
mm/slub.c | 1 -
4 files changed, 3 insertions(+), 6 deletions(-)
Index: linux/mm/slab.c
===================================================================
--- linux.orig/mm/slab.c 2012-08-22 10:27:54.838388363 -0500
+++ linux/mm/slab.c 2012-08-22 10:28:31.658969127 -0500
@@ -2543,7 +2543,6 @@ __kmem_cache_create (struct kmem_cache *
*/
BUG_ON(ZERO_OR_NULL_PTR(cachep->slabp_cache));
}
- cachep->refcount = 1;
err = setup_cpu_cache(cachep, gfp);
if (err) {
Index: linux/mm/slab_common.c
===================================================================
--- linux.orig/mm/slab_common.c 2012-08-22 10:27:54.858388583 -0500
+++ linux/mm/slab_common.c 2012-08-22 10:28:31.658969127 -0500
@@ -125,11 +125,12 @@ struct kmem_cache *kmem_cache_create(con
}
err = __kmem_cache_create(s, flags);
- if (!err)
+ if (!err) {
+ s->refcount = 1;
list_add(&s->list, &slab_caches);
- else {
+ } else {
kfree(s->name);
kmem_cache_free(kmem_cache, s);
}
Index: linux/mm/slob.c
===================================================================
--- linux.orig/mm/slob.c 2012-08-22 10:27:54.846388442 -0500
+++ linux/mm/slob.c 2012-08-22 10:28:31.658969127 -0500
@@ -524,8 +524,6 @@ int __kmem_cache_create(struct kmem_cach
if (c->align < align)
c->align = align;
- kmemleak_alloc(c, sizeof(struct kmem_cache), 1, GFP_KERNEL);
- c->refcount = 1;
return 0;
}
Index: linux/mm/slub.c
===================================================================
--- linux.orig/mm/slub.c 2012-08-22 10:27:54.870388814 -0500
+++ linux/mm/slub.c 2012-08-22 10:28:31.662969186 -0500
@@ -3093,7 +3093,6 @@ static int kmem_cache_open(struct kmem_c
else
s->cpu_partial = 30;
- s->refcount = 1;
#ifdef CONFIG_NUMA
s->remote_node_defrag_ratio = 1000;
#endif
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>