From 5c53addceb0dcd4c0a23fedbf189e892c585cb16 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Tue, 8 Nov 2005 21:39:38 -0800
Subject: [PATCH] --- yaml --- r: 13501 b: refs/heads/master c:
 3855ad9f398de88a3290f7dd799633c4b73903ea h: refs/heads/master i:   13499:
 caec3430825ab17d9cc43e43d8f7dff847e08f79 v: v3

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

diff --git a/[refs] b/[refs]
index e3398ae03324..7f3d62fdcf5a 100644
--- 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
index d1c488b008af..51003b008de7 100644
--- 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;