From 8ff0b040a2e2429ac886b544e451494d8ac3d8ef Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Thu, 25 Mar 2010 16:06:03 +1100
Subject: [PATCH] --- yaml --- r: 197485 b: refs/heads/master c:
 2b7f22284d71975e37a82db154386348eec0e52c h: refs/heads/master i:   197483:
 05eeac2fb5a91ae27ca7413f85672828bcad51d3 v: v3

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

diff --git a/[refs] b/[refs]
index 0664b1ad0ffc..36b55bdebc80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a78d38a1a16c8e009aa512caa71d483757fefc1c
+refs/heads/master: 2b7f22284d71975e37a82db154386348eec0e52c
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
index 020143dec180..7bfeba3ce1e0 100644
--- a/trunk/drivers/md/raid5.c
+++ b/trunk/drivers/md/raid5.c
@@ -3713,10 +3713,10 @@ static void raid5_align_endio(struct bio *bi, int error)
 
 	bio_put(bi);
 
-	mddev = raid_bi->bi_bdev->bd_disk->queue->queuedata;
-	conf = mddev->private;
 	rdev = (void*)raid_bi->bi_next;
 	raid_bi->bi_next = NULL;
+	mddev = rdev->mddev;
+	conf = mddev->private;
 
 	rdev_dec_pending(rdev, conf->mddev);