From df6de1f68ecc726440199a33f4380f46ebc7e0f1 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Mon, 14 Dec 2009 12:49:47 +1100
Subject: [PATCH] --- yaml --- r: 176076 b: refs/heads/master c:
 8553fe7ec731e4f997245e14319572cb15118018 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/md/raid5.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e2595998e737..968f0b1a3589 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa5cbd103887011b4830355f88fb055f9ad2d556
+refs/heads/master: 8553fe7ec731e4f997245e14319572cb15118018
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
index d29215d966da..34cb065f6d66 100644
--- a/trunk/drivers/md/raid5.c
+++ b/trunk/drivers/md/raid5.c
@@ -3358,7 +3358,6 @@ static void handle_stripe6(struct stripe_head *sh)
 	 * completed
 	 */
 	if (sh->reconstruct_state == reconstruct_state_drain_result) {
-		int qd_idx = sh->qd_idx;
 
 		sh->reconstruct_state = reconstruct_state_idle;
 		/* All the 'written' buffers and the parity blocks are ready to
@@ -3741,7 +3740,7 @@ static int chunk_aligned_read(struct request_queue *q, struct bio * raid_bio)
 {
 	mddev_t *mddev = q->queuedata;
 	raid5_conf_t *conf = mddev->private;
-	unsigned int dd_idx;
+	int dd_idx;
 	struct bio* align_bi;
 	mdk_rdev_t *rdev;