From 5c4833b43462b4aa9a4be3660e2350779beffd73 Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Mon, 18 Jul 2011 17:38:50 +1000 Subject: [PATCH] --- yaml --- r: 260971 b: refs/heads/master c: 6ce328462c1145a217ba1f27b882743be1407759 h: refs/heads/master i: 260969: fcd47f419de46ecb21c5ea3a76db92431015b972 260967: 0bc323a9760c7fb7e82b2ca8e9e476ab93f40675 v: v3 --- [refs] | 2 +- trunk/drivers/md/raid5.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 65229e66d677..3301abd607b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c65060ad4274f70048d62e0a86332cd3fd23f28d +refs/heads/master: 6ce328462c1145a217ba1f27b882743be1407759 diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c index b72edf35ec54..0f71aa9a07c5 100644 --- a/trunk/drivers/md/raid5.c +++ b/trunk/drivers/md/raid5.c @@ -1315,10 +1315,10 @@ static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request) static int grow_one_stripe(raid5_conf_t *conf) { struct stripe_head *sh; - sh = kmem_cache_alloc(conf->slab_cache, GFP_KERNEL); + sh = kmem_cache_zalloc(conf->slab_cache, GFP_KERNEL); if (!sh) return 0; - memset(sh, 0, sizeof(*sh) + (conf->pool_size-1)*sizeof(struct r5dev)); + sh->raid_conf = conf; spin_lock_init(&sh->lock); #ifdef CONFIG_MULTICORE_RAID456 @@ -1435,12 +1435,10 @@ static int resize_stripes(raid5_conf_t *conf, int newsize) return -ENOMEM; for (i = conf->max_nr_stripes; i; i--) { - nsh = kmem_cache_alloc(sc, GFP_KERNEL); + nsh = kmem_cache_zalloc(sc, GFP_KERNEL); if (!nsh) break; - memset(nsh, 0, sizeof(*nsh) + (newsize-1)*sizeof(struct r5dev)); - nsh->raid_conf = conf; spin_lock_init(&nsh->lock); #ifdef CONFIG_MULTICORE_RAID456