diff --git a/[refs] b/[refs] index 815b2ffd6d1f..4cc314d3dffa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c32fb9e7ecee25a5b6a45bf968dfef76f323e185 +refs/heads/master: 4f0a5e012cf41321d611e7cad63e1017d143d138 diff --git a/trunk/drivers/md/raid1.c b/trunk/drivers/md/raid1.c index 8e717bd518e7..835de7168cd3 100644 --- a/trunk/drivers/md/raid1.c +++ b/trunk/drivers/md/raid1.c @@ -2600,7 +2600,8 @@ static struct r1conf *setup_conf(struct mddev *mddev) if (!disk->rdev || !test_bit(In_sync, &disk->rdev->flags)) { disk->head_position = 0; - if (disk->rdev) + if (disk->rdev && + (disk->rdev->saved_raid_disk < 0)) conf->fullsync = 1; } else if (conf->last_used < 0) /*