---

yaml --- r: 13501 b: refs/heads/master c: 3855ad9 h: refs/heads/master i: 13499: caec343 v: v3
git-mirror · Nov 9, 2005 · 5c53add · 5c53add
1 parent cbd833b
commit 5c53add
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5de485f00d6e6c15f487869faaf999c708f69b1
+refs/heads/master: 3855ad9f398de88a3290f7dd799633c4b73903ea
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
@@ -1645,6 +1645,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
 		return rv;
 	}
 	if (!bitmap_start_sync(mddev->bitmap, sector_nr, &sync_blocks, 1) &&
+	    !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery) &&
 	    !conf->fullsync && sync_blocks >= STRIPE_SECTORS) {
 		/* we can skip this block, and probably more */
 		sync_blocks /= STRIPE_SECTORS;