Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12dd36fa authored by Matthew Dobson's avatar Matthew Dobson Committed by Linus Torvalds
Browse files

[PATCH] slab: extract slab_destroy_objs() 



Create a helper function, slab_destroy_objs() which called from
slab_destroy().  This makes slab_destroy() smaller and more readable, and
moves ifdefs outside the function body.

Signed-off-by: default avatarMatthew Dobson <colpatch@us.ibm.com>
Acked-by: default avatarManfred Spraul <manfred@colorfullife.com>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fbaccacf

mm/slab.c

+19 −7
Original line number Diff line number Diff line
@@ -1459,15 +1459,13 @@ static void check_poison_obj(kmem_cache_t *cachep, void *objp) 
}

#endif



/* Destroy all the objs in a slab, and release the mem back to the system.

 * Before calling the slab must have been unlinked from the cache.

 * The cache-lock is not held/needed.

#if DEBUG

/**

 * slab_destroy_objs - call the registered destructor for each object in

 *      a slab that is to be destroyed.

 */

static void slab_destroy(kmem_cache_t *cachep, struct slab *slabp)

static void slab_destroy_objs(kmem_cache_t *cachep, struct slab *slabp)

{

	void *addr = slabp->s_mem - slabp->colouroff;



#if DEBUG

	int i;

	for (i = 0; i < cachep->num; i++) {

		void *objp = slabp->s_mem + cachep->buffer_size * i;
@@ -1496,7 +1494,10 @@ static void slab_destroy(kmem_cache_t *cachep, struct slab *slabp) 
		if (cachep->dtor && !(cachep->flags & SLAB_POISON))

			(cachep->dtor) (objp + obj_offset(cachep), cachep, 0);

	}

}

#else

static void slab_destroy_objs(kmem_cache_t *cachep, struct slab *slabp)

{

	if (cachep->dtor) {

		int i;

		for (i = 0; i < cachep->num; i++) {
@@ -1504,8 +1505,19 @@ static void slab_destroy(kmem_cache_t *cachep, struct slab *slabp) 
			(cachep->dtor) (objp, cachep, 0);

		}

	}

}

#endif



/**

 * Destroy all the objs in a slab, and release the mem back to the system.

 * Before calling the slab must have been unlinked from the cache.

 * The cache-lock is not held/needed.

 */

static void slab_destroy(kmem_cache_t *cachep, struct slab *slabp)

{

	void *addr = slabp->s_mem - slabp->colouroff;



	slab_destroy_objs(cachep, slabp);

	if (unlikely(cachep->flags & SLAB_DESTROY_BY_RCU)) {

		struct slab_rcu *slab_rcu;