Commit cce89f4f authored by Christoph Lameter's avatar Christoph Lameter Committed by Pekka Enberg
Browse files

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: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
parent 8a13a4cc

mm/slab.c

+0 −1
Original line number Diff line number Diff line
@@ -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) {

mm/slab_common.c

+3 −2
Original line number Diff line number Diff line
@@ -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);

		}

mm/slob.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

}

mm/slub.c

+0 −1
Original line number Diff line number Diff line
@@ -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