From b297775d243a5b6e45ae6774f92d8384df0f788f Mon Sep 17 00:00:00 2001
From: majianpeng <majianpeng@gmail.com>
Date: Tue, 3 Jul 2012 12:11:54 +1000
Subject: [PATCH] --- yaml --- r: 311555 b: refs/heads/master c:
 1850753d2e6d9ca7856581ca5d3cf09521e6a5d7 h: refs/heads/master i:   311553:
 0d04ba2e6becbcc214e751f205ec197580a4b3aa   311551:
 606cd78d0af42df0c3e8c08c4ad766e5b34ba698 v: v3

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

diff --git a/[refs] b/[refs]
index 152c154fee90..04615090afbb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c0544e255dd6582a9899572e120fb55d9f672a4
+refs/heads/master: 1850753d2e6d9ca7856581ca5d3cf09521e6a5d7
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
index 9567a9c83a1f..befadb41a11f 100644
--- a/trunk/drivers/md/raid5.c
+++ b/trunk/drivers/md/raid5.c
@@ -606,6 +606,12 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)
 					 * a chance*/
 					md_check_recovery(conf->mddev);
 				}
+				/*
+				 * Because md_wait_for_blocked_rdev
+				 * will dec nr_pending, we must
+				 * increment it first.
+				 */
+				atomic_inc(&rdev->nr_pending);
 				md_wait_for_blocked_rdev(rdev, conf->mddev);
 			} else {
 				/* Acknowledged bad block - skip the write */