SLUB: remove useless masking of GFP_ZERO

Remove a recently added useless masking of GFP_ZERO.  GFP_ZERO is already
masked out in new_slab() (See how it calls allocate_slab).  No need to do
it twice.

This reverts the SLUB parts of 7fd272550b.

Cc: Matt Mackall <mpm@selenic.com>
Reviewed-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Christoph Lameter 2007-12-17 16:20:27 -08:00 committed by Linus Torvalds
parent 087ee8d5be
commit 3811dbf671

View file

@ -1468,9 +1468,6 @@ static void *__slab_alloc(struct kmem_cache *s,
void **object; void **object;
struct page *new; struct page *new;
/* We handle __GFP_ZERO in the caller */
gfpflags &= ~__GFP_ZERO;
if (!c->page) if (!c->page)
goto new_slab; goto new_slab;