From c47d1ff43b35122a65a2ea57d648e54ff2e9f5b5 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Fri, 6 Jan 2006 00:20:35 -0800
Subject: [PATCH] --- yaml --- r: 16550 b: refs/heads/master c:
 a24a8dd858e0ba50f06a9fd8f61fe8c4fe7a8d8e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ae7fb56afde9..b4fee80a5a76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8745db232dd86f145bff6946e78f839acab511b
+refs/heads/master: a24a8dd858e0ba50f06a9fd8f61fe8c4fe7a8d8e
diff --git a/trunk/drivers/md/raid10.c b/trunk/drivers/md/raid10.c
index 254b50e32135..253322ae9195 100644
--- a/trunk/drivers/md/raid10.c
+++ b/trunk/drivers/md/raid10.c
@@ -1672,8 +1672,10 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
 				for (j=0; j<conf->copies;j++) {
 					int d = r10_bio->devs[j].devnum;
 					if (conf->mirrors[d].rdev == NULL ||
-					    test_bit(Faulty, &conf->mirrors[d].rdev->flags))
+					    test_bit(Faulty, &conf->mirrors[d].rdev->flags)) {
 						still_degraded = 1;
+						break;
+					}
 				}
 				must_sync = bitmap_start_sync(mddev->bitmap, sect,
 							      &sync_blocks, still_degraded);