Skip to content

Commit

Permalink
slub: Remove useless statements in __slab_alloc
Browse files Browse the repository at this point in the history
Two statements in __slab_alloc() do not have any effect.

1. c->page is already set to NULL by deactivate_slab() called right before.

2. gfpflags are masked in new_slab() before being passed to the page
   allocator. There is no need to mask gfpflags in __slab_alloc in particular
   since most frequent processing in __slab_alloc does not require the use of a
   gfpmask.

Cc: torvalds@linux-foundation.org
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
  • Loading branch information
Christoph Lameter authored and Pekka Enberg committed Aug 19, 2011
1 parent 69cb8e6 commit 7db0d70
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions mm/slub.c
Original file line number Diff line number Diff line change
Expand Up @@ -2064,9 +2064,6 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
c = this_cpu_ptr(s->cpu_slab);
#endif

/* We handle __GFP_ZERO in the caller */
gfpflags &= ~__GFP_ZERO;

page = c->page;
if (!page)
goto new_slab;
Expand Down Expand Up @@ -2163,7 +2160,6 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,

c->freelist = get_freepointer(s, object);
deactivate_slab(s, c);
c->page = NULL;
c->node = NUMA_NO_NODE;
local_irq_restore(flags);
return object;
Expand Down

0 comments on commit 7db0d70

Please sign in to comment.