diff --git a/[refs] b/[refs] index 4823a16e4a6e..343a699c02da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5a10f62c5c496c49db749af103b991873b7e2dc +refs/heads/master: 1be7892fffb45f6017494a88ff68fe84c6de26b4 diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c index 875bced88e36..686314f070a5 100644 --- a/trunk/drivers/md/md.c +++ b/trunk/drivers/md/md.c @@ -895,10 +895,9 @@ static void super_90_sync(mddev_t *mddev, mdk_rdev_t *rdev) d->raid_disk = rdev2->raid_disk; else d->raid_disk = rdev2->desc_nr; /* compatibility */ - if (test_bit(Faulty, &rdev2->flags)) { + if (test_bit(Faulty, &rdev2->flags)) d->state = (1<flags)) { + else if (test_bit(In_sync, &rdev2->flags)) { d->state = (1<state |= (1<