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);