iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

slub: Rearrange #ifdef CONFIG_SLUB_DEBUG in calculate_sizes()

Browse Source 
Group SLUB_DEBUG code together to reduce the number of #ifdefs. Move some
debug checks under the #ifdef.

Reviewed-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Christoph Lameter <clameter@sgi.com>
This commit is contained in:
Christoph Lameter 2008-02-15 23:45:25 -08:00
parent ae20bfda68
commit d8b42bf54b
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mm/slub.c
View File

@ -2129,6 +2129,14 @@ static int calculate_sizes(struct kmem_cache *s)
unsigned long size = s->objsize; unsigned long size = s->objsize;
unsigned long align = s->align; unsigned long align = s->align;
/*
* Round up object size to the next word boundary. We can only
* place the free pointer at word boundaries and this determines
* the possible location of the free pointer.
*/
size = ALIGN(size, sizeof(void *));
#ifdef CONFIG_SLUB_DEBUG
/* /*
* Determine if we can poison the object itself. If the user of * Determine if we can poison the object itself. If the user of
* the slab may touch the object after free or before allocation * the slab may touch the object after free or before allocation
@ -2140,14 +2148,7 @@ static int calculate_sizes(struct kmem_cache *s)
else else
s->flags &= ~__OBJECT_POISON; s->flags &= ~__OBJECT_POISON;
/*
* Round up object size to the next word boundary. We can only
* place the free pointer at word boundaries and this determines
* the possible location of the free pointer.
*/
size = ALIGN(size, sizeof(void *));
#ifdef CONFIG_SLUB_DEBUG
/* /*
* If we are Redzoning then check if there is some space between the * If we are Redzoning then check if there is some space between the
* end of the object and the free pointer. If not then add an * end of the object and the free pointer. If not then add an