---

yaml --- r: 43999 b: refs/heads/master c: 5248861 h: refs/heads/master i: 43997: eda0f52 43995: 8489182 43991: 291ca6c 43983: af0ae3d 43967: a14fa94 v: v3
git-mirror · Dec 10, 2006 · 53cb41b · 53cb41b
1 parent d7e2078
commit 53cb41b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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;