---

yaml --- r: 311555 b: refs/heads/master c: 1850753 h: refs/heads/master i: 311553: 0d04ba2 311551: 606cd78 v: v3
git-mirror · Jul 3, 2012 · b297775 · b297775
1 parent 29d5cd4
commit b297775
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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 */