---

yaml --- r: 305963 b: refs/heads/master c: 4f0a5e0 h: refs/heads/master i: 305961: 65a1b1a 305959: bc15ff0 v: v3
git-mirror · May 22, 2012 · e16eeac · e16eeac
1 parent fc1a1b0
commit e16eeac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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)
 			/*