From 5c96ec14cdc9452055fb14a20ec316a7d9e83633 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Thu, 19 Jul 2012 15:59:18 +1000
Subject: [PATCH] --- yaml --- r: 312092 b: refs/heads/master c:
 58e94ae18478c08229626daece2fc108a4a23261 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9190115d6a70..d4c4d61bb7b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a05b7ea03d72f36edb0cec05e8893803335c61a0
+refs/heads/master: 58e94ae18478c08229626daece2fc108a4a23261
diff --git a/trunk/drivers/md/raid1.c b/trunk/drivers/md/raid1.c
index 240ff3125040..cacd008d6864 100644
--- a/trunk/drivers/md/raid1.c
+++ b/trunk/drivers/md/raid1.c
@@ -1818,8 +1818,14 @@ static void sync_request_write(struct mddev *mddev, struct r1bio *r1_bio)
 
 	if (atomic_dec_and_test(&r1_bio->remaining)) {
 		/* if we're here, all write(s) have completed, so clean up */
-		md_done_sync(mddev, r1_bio->sectors, 1);
-		put_buf(r1_bio);
+		int s = r1_bio->sectors;
+		if (test_bit(R1BIO_MadeGood, &r1_bio->state) ||
+		    test_bit(R1BIO_WriteError, &r1_bio->state))
+			reschedule_retry(r1_bio);
+		else {
+			put_buf(r1_bio);
+			md_done_sync(mddev, s, 1);
+		}
 	}
 }