summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Lameter <cl@linux.com>2012-09-04 23:38:33 +0000
committerPekka Enberg <penberg@kernel.org>2012-09-05 12:00:37 +0300
commitcce89f4f6911286500cf7be0363f46c9b0a12ce0 (patch)
treec60d648404ea213d2f3d657c64fb86b2243e6a89
parent8a13a4cc80bb25c9eab2e7e56bab724fcfa55fce (diff)
downloadlinux-3.10-cce89f4f6911286500cf7be0363f46c9b0a12ce0.tar.gz
linux-3.10-cce89f4f6911286500cf7be0363f46c9b0a12ce0.tar.bz2
linux-3.10-cce89f4f6911286500cf7be0363f46c9b0a12ce0.zip
mm/sl[aou]b: Move kmem_cache refcounting to common code
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@linux.com> Signed-off-by: Pekka Enberg <penberg@kernel.org>
-rw-r--r--mm/slab.c1
-rw-r--r--mm/slab_common.c5
-rw-r--r--mm/slob.c1
-rw-r--r--mm/slub.c1
4 files changed, 3 insertions, 5 deletions
diff --git a/mm/slab.c b/mm/slab.c
index f1f6d54e129..11d9af5f9d2 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2555,7 +2555,6 @@ __kmem_cache_create (struct kmem_cache *cachep, unsigned long flags)
*/
BUG_ON(ZERO_OR_NULL_PTR(cachep->slabp_cache));
}
- cachep->refcount = 1;
err = setup_cpu_cache(cachep, gfp);
if (err) {
diff --git a/mm/slab_common.c b/mm/slab_common.c
index 8a85a19d90e..651a3c60847 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -125,11 +125,12 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, size_t align
}
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);
}
diff --git a/mm/slob.c b/mm/slob.c
index cac05d92f32..3edfeaac320 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -524,7 +524,6 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
if (c->align < align)
c->align = align;
- c->refcount = 1;
return 0;
}
diff --git a/mm/slub.c b/mm/slub.c
index d8ee419d5a1..0b122d8ec21 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3093,7 +3093,6 @@ static int kmem_cache_open(struct kmem_cache *s, unsigned long flags)
else
s->cpu_partial = 30;
- s->refcount = 1;
#ifdef CONFIG_NUMA
s->remote_node_defrag_ratio = 1000;
#endif