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; jcopies;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);