---

yaml --- r: 311557 b: refs/heads/master c: 5f066c6 h: refs/heads/master i: 311555: b297775 v: v3
git-mirror · Jul 3, 2012 · d71363b · d71363b
1 parent b8b2e71
commit d71363b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c2c57c9a98bf5961e438a376486f95346f6b0c5
+refs/heads/master: 5f066c632fcfd2a33f2eb7077c15c630e9f5ea5b
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
@@ -3588,8 +3588,18 @@ static void handle_stripe(struct stripe_head *sh)
 
 finish:
 	/* wait for this device to become unblocked */
-	if (conf->mddev->external && unlikely(s.blocked_rdev))
-		md_wait_for_blocked_rdev(s.blocked_rdev, conf->mddev);
+	if (unlikely(s.blocked_rdev)) {
+		if (conf->mddev->external)
+			md_wait_for_blocked_rdev(s.blocked_rdev,
+						 conf->mddev);
+		else
+			/* Internal metadata will immediately
+			 * be written by raid5d, so we don't
+			 * need to wait here.
+			 */
+			rdev_dec_pending(s.blocked_rdev,
+					 conf->mddev);
+	}
 
 	if (s.handle_bad_blocks)
 		for (i = disks; i--; ) {