slab: extract slab_destroy_objs()
PATCH 5/9 slab: extract slab_destroy_objs()
From: Matthew Dobson <[email protected]>
This patch creates 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 Matthew Dobson <[email protected]>
Acked-by Manfred Spraul <[email protected]>
Signed-off-by Pekka Enberg <[email protected]>
---
mm/slab.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-)
mm/slab.c +19 -7
@@ -1445,15 +1445,13 @@ static void check_poison_obj(kmem_cache_ }#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;
@@ -1479,7 +1477,10 @@ static void slab_destroy (kmem_cache_t *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++) {
@@ -1487,8 +1488,19 @@ static void slab_destroy (kmem_cache_t * (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;
--