From cc2274ff69d3ef00aab5433dab6ae22884d70527 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Tue, 16 Oct 2007 23:30:55 -0700
Subject: [PATCH] --- yaml --- r: 70744 b: refs/heads/master c:
 cf7a44168d743ca97863b7f34ed42a45fd7b5ab0 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/md/raid1.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 40c0c473647f..e8ebeecb5803 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7f3d291a0e1330f341fdf1128b2d12fff7932ee
+refs/heads/master: cf7a44168d743ca97863b7f34ed42a45fd7b5ab0
diff --git a/trunk/drivers/md/raid1.c b/trunk/drivers/md/raid1.c
index 0bcefad82413..16775a0df7f6 100644
--- a/trunk/drivers/md/raid1.c
+++ b/trunk/drivers/md/raid1.c
@@ -1214,7 +1214,8 @@ static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio)
 					j = 0;
 				if (j >= 0)
 					mddev->resync_mismatches += r1_bio->sectors;
-				if (j < 0 || test_bit(MD_RECOVERY_CHECK, &mddev->recovery)) {
+				if (j < 0 || (test_bit(MD_RECOVERY_CHECK, &mddev->recovery)
+					      && test_bit(BIO_UPTODATE, &sbio->bi_flags))) {
 					sbio->bi_end_io = NULL;
 					rdev_dec_pending(conf->mirrors[i].rdev, mddev);
 				} else {