diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-02-15 23:45:25 -0800 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-03-03 12:22:31 -0800 |
| commit | d8b42bf54be18b5d0bad941b3a1d3e8f022651a7 (patch) | |
| tree | 50c43281c981a82f0f1742fcc84919e35270e9f8 | |
| parent | ae20bfda6813387af18c7fdbc0f8b1fa7be2d05b (diff) | |
slub: Rearrange #ifdef CONFIG_SLUB_DEBUG in calculate_sizes()
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>
| -rw-r--r-- | mm/slub.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/mm/slub.c b/mm/slub.c index 09b5dc82df5..72f5f4ecd1d 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -2130,6 +2130,14 @@ static int calculate_sizes(struct kmem_cache *s) 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 * the slab may touch the object after free or before allocation * then we should never poison the object itself. @@ -2140,14 +2148,7 @@ static int calculate_sizes(struct kmem_cache *s) else 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 * end of the object and the free pointer. If not then add an |