aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaicheng Li <haicheng.li@linux.intel.com>2010-01-06 02:25:23 -0500
committerPekka Enberg <penberg@cs.helsinki.fi>2010-01-11 11:56:07 -0500
commitf3186a9c51eabe75b2780153ed7f07778d78b16e (patch)
treeab8c267ad09ead33c8ed757612b34ad5a1b70ce7
parent6b7b284958d47b77d06745b36bc7f36dab769d9b (diff)
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>
-rw-r--r--mm/slab.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/mm/slab.c b/mm/slab.c
index 7d41f15b48d3..0c632a946ea1 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)
983 983
984 if (limit > 1) 984 if (limit > 1)
985 limit = 12; 985 limit = 12;
986 ac_ptr = kmalloc_node(memsize, gfp, node); 986 ac_ptr = kzalloc_node(memsize, gfp, node);
987 if (ac_ptr) { 987 if (ac_ptr) {
988 for_each_node(i) { 988 for_each_node(i) {
989 if (i == node || !node_online(i)) { 989 if (i == node || !node_online(i))
990 ac_ptr[i] = NULL;
991 continue; 990 continue;
992 }
993 ac_ptr[i] = alloc_arraycache(node, limit, 0xbaadf00d, gfp); 991 ac_ptr[i] = alloc_arraycache(node, limit, 0xbaadf00d, gfp);
994 if (!ac_ptr[i]) { 992 if (!ac_ptr[i]) {
995 for (i--; i >= 0; i--) 993 for (i--; i >= 0; i--)