---

yaml --- r: 312092 b: refs/heads/master c: 58e94ae h: refs/heads/master v: v3
git-mirror · Jul 19, 2012 · 5c96ec1 · 5c96ec1
1 parent 51cc602
commit 5c96ec1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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);
+		}
 	}
 }