From 53cb41b36d160d625a44914e537f7da6e537482b Mon Sep 17 00:00:00 2001
From: "Raz Ben-Jehuda(caro)" <raziebe@gmail.com>
Date: Sun, 10 Dec 2006 02:20:48 -0800
Subject: [PATCH] --- yaml --- r: 43999 b: refs/heads/master c:
 5248861511d6aae4997a5aa7152824d87587b0b6 h: refs/heads/master i:   43997:
 eda0f52f1b3fd1512f97754cff567203f5624751   43995:
 84891826f2be82c9fc225c6f09be8c607745795f   43991:
 291ca6c6b576c541274a15562d0d94baf0cf1d85   43983:
 af0ae3d9c31b61a44de2afe1d2fa37d1c4c4b72a   43967:
 a14fa94641db001a6544f99a68293dc373a4cc9f v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/md/raid5.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3f870c680f3b..c74e33a7e110 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46031f9a38a9773021f1872abc713d62467ac22e
+refs/heads/master: 5248861511d6aae4997a5aa7152824d87587b0b6
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
index 2ac2e56a1a40..2e676e33744c 100644
--- a/trunk/drivers/md/raid5.c
+++ b/trunk/drivers/md/raid5.c
@@ -2808,6 +2808,11 @@ static int make_request(request_queue_t *q, struct bio * bi)
 	disk_stat_inc(mddev->gendisk, ios[rw]);
 	disk_stat_add(mddev->gendisk, sectors[rw], bio_sectors(bi));
 
+	if (bio_data_dir(bi) == READ &&
+	     mddev->reshape_position == MaxSector &&
+	     chunk_aligned_read(q,bi))
+            	return 0;
+
 	logical_sector = bi->bi_sector & ~((sector_t)STRIPE_SECTORS-1);
 	last_sector = bi->bi_sector + (bi->bi_size>>9);
 	bi->bi_next = NULL;