The following commit has been merged in the linux branch: commit 6629542e79255e0dbef8ec82eaf644e1b2546c3c Author: Dan Williams dan.j.williams@intel.com Date: Mon Oct 19 18:09:32 2009 -0700
md/raid6: kill a gcc-4.0.1 'uninitialized variable' warning
Signed-off-by: Dan Williams dan.j.williams@intel.com
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index dcd9e65..81abefc 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -156,16 +156,16 @@ static inline int raid6_next_disk(int disk, int raid_disks) static int raid6_idx_to_slot(int idx, struct stripe_head *sh, int *count, int syndrome_disks) { - int slot; + int slot = *count;
if (sh->ddf_layout) - slot = (*count)++; + (*count)++; if (idx == sh->pd_idx) return syndrome_disks; if (idx == sh->qd_idx) return syndrome_disks + 1; if (!sh->ddf_layout) - slot = (*count)++; + (*count)++; return slot; }