summaryrefslogtreecommitdiff
path: root/mm/slab.c
diff options
context:
space:
mode:
authorHaicheng Li <haicheng.li@linux.intel.com>2010-01-06 15:25:23 +0800
committerPekka Enberg <penberg@cs.helsinki.fi>2010-01-11 18:56:07 +0200
commitf3186a9c51eabe75b2780153ed7f07778d78b16e (patch)
treeab8c267ad09ead33c8ed757612b34ad5a1b70ce7 /mm/slab.c
parent6b7b284958d47b77d06745b36bc7f36dab769d9b (diff)
downloadlinux-3.10-f3186a9c51eabe75b2780153ed7f07778d78b16e.tar.gz
linux-3.10-f3186a9c51eabe75b2780153ed7f07778d78b16e.tar.bz2
linux-3.10-f3186a9c51eabe75b2780153ed7f07778d78b16e.zip
slab: initialize unused alien cache entry as NULL at alloc_alien_cache().
Comparing with existing code, it's a simpler way to use kzalloc_node() to ensure that each unused alien cache entry is NULL. CC: Eric Dumazet <eric.dumazet@gmail.com> Acked-by: Andi Kleen <ak@linux.intel.com> Acked-by: Christoph Lameter <cl@linux-foundation.org> Acked-by: Matt Mackall <mpm@selenic.com> Signed-off-by: Haicheng Li <haicheng.li@linux.intel.com> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Diffstat (limited to 'mm/slab.c')
-rw-r--r--mm/slab.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/mm/slab.c b/mm/slab.c
index 7d41f15b48d..0c632a946ea 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -983,13 +983,11 @@ static struct array_cache **alloc_alien_cache(int node, int limit, gfp_t gfp)
if (limit > 1)
limit = 12;
- ac_ptr = kmalloc_node(memsize, gfp, node);
+ ac_ptr = kzalloc_node(memsize, gfp, node);
if (ac_ptr) {
for_each_node(i) {
- if (i == node || !node_online(i)) {
- ac_ptr[i] = NULL;
+ if (i == node || !node_online(i))
continue;
- }
ac_ptr[i] = alloc_arraycache(node, limit, 0xbaadf00d, gfp);
if (!ac_ptr[i]) {
for (i--; i >= 0; i--)