From ccd175c58a9f790b92200f15b8b3bb9abbfc6038 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Wed, 26 Oct 2011 10:31:04 +1100
Subject: [PATCH] --- yaml --- r: 269275 b: refs/heads/master c:
 355840e7a7e56bb2834fd3b0da64da5465f8aeaa h: refs/heads/master i:   269273:
 6203b319d7a5e3b8a7402af1ab6052d2f96a873b   269271:
 a732dd33b26a58d2520d38674543b80503e5341a v: v3

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

diff --git a/[refs] b/[refs]
index a523a4b48548..02b16375e75e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd860c53d4f9cad520d233e1ba690aaacfb39e9b
+refs/heads/master: 355840e7a7e56bb2834fd3b0da64da5465f8aeaa
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
index eea9379f7fae..521bf2605f82 100644
--- a/trunk/drivers/md/raid5.c
+++ b/trunk/drivers/md/raid5.c
@@ -3062,7 +3062,7 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s)
 			}
 		} else if (test_bit(In_sync, &rdev->flags))
 			set_bit(R5_Insync, &dev->flags);
-		else {
+		else if (!test_bit(Faulty, &rdev->flags)) {
 			/* in sync if before recovery_offset */
 			if (sh->sector + STRIPE_SECTORS <= rdev->recovery_offset)
 				set_bit(R5_Insync, &dev->flags);