From 1f6baad5ae80502ba5ae781202d2ff9a6e794fc8 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Wed, 31 Aug 2011 12:49:14 +1000 Subject: [PATCH] --- yaml --- r: 263612 b: refs/heads/master c: 43220aa0f22cd3ce5b30246d50ccd696d119edea h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/raid5.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e8bd26f55232..25d3c495d147 100644 --- 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 index dbae459fb02d..43709fa6b6df 100644 --- 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)