2007-12-27 20:27:28

by Marcin Ślusarz

Subject: [PATCH] slab: avoid double initialization & do it in 1 function

* alloc_slabmgmt: initialize all slab fields in 1 function
* slab->nodeid was initialized twice: in alloc_slabmgmt
and immediately after it in cache_grow

Signed-off-by: Marcin Slusarz <[email protected]>
CC: Christoph Lameter <[email protected]>
CC: Pekka Enberg <[email protected]>
diff --git a/mm/slab.c b/mm/slab.c
index 2e338a5..458b07a 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2626,6 +2626,7 @@ static struct slab *alloc_slabmgmt(struct kmem_cache *cachep, void *objp,
slabp->colouroff = colour_off;
slabp->s_mem = objp + colour_off;
slabp->nodeid = nodeid;
+ slabp->free = 0;
return slabp;
}

@@ -2679,7 +2680,6 @@ static void cache_init_objs(struct kmem_cache *cachep,
slab_bufctl(slabp)[i] = i + 1;
}
slab_bufctl(slabp)[i - 1] = BUFCTL_END;
- slabp->free = 0;
}

static void kmem_flagcheck(struct kmem_cache *cachep, gfp_t flags)
@@ -2812,7 +2812,6 @@ static int cache_grow(struct kmem_cache *cachep,
if (!slabp)
goto opps1;

- slabp->nodeid = nodeid;
slab_map_pages(cachep, slabp, objp);

cache_init_objs(cachep, slabp);

2007-12-29 08:49:37

by Pekka Enberg

Subject: Re: [PATCH] slab: avoid double initialization & do it in 1 function

Hi Marcin,

On Thu, 27 Dec 2007, Marcin Slusarz wrote:
> * alloc_slabmgmt: initialize all slab fields in 1 function
> * slab->nodeid was initialized twice: in alloc_slabmgmt
> and immediately after it in cache_grow

Looks good to me.

Reviewed-by: Pekka Enberg <[email protected]>