---

yaml --- r: 263612 b: refs/heads/master c: 43220aa h: refs/heads/master v: v3
git-mirror · Aug 31, 2011 · 1f6baad · 1f6baad
1 parent f9c2797
commit 1f6baad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7da64a0abc3b2c6cbd3521672e9bb74dd560bb89
+refs/heads/master: 43220aa0f22cd3ce5b30246d50ccd696d119edea
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
@@ -3336,7 +3336,7 @@ static void handle_stripe(struct stripe_head *sh)
 
 finish:
 	/* wait for this device to become unblocked */
-	if (unlikely(s.blocked_rdev))
+	if (conf->mddev->external && unlikely(s.blocked_rdev))
 		md_wait_for_blocked_rdev(s.blocked_rdev, conf->mddev);
 
 	if (s.handle_bad_blocks)