From 23ee1c732e352b6d48c11b8e259bfdf2de44b301 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Wed, 22 Aug 2007 14:01:52 -0700
Subject: [PATCH] --- yaml --- r: 64256 b: refs/heads/master c:
 918f02383fb9ff5dba29709f3199189eeac55021 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2b15aabc47a6..d2fcf103bb51 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59d9445e851976d973a5a4009f80a3d55959d231
+refs/heads/master: 918f02383fb9ff5dba29709f3199189eeac55021
diff --git a/trunk/drivers/md/raid1.c b/trunk/drivers/md/raid1.c
index 650991bddd8e..ea2a58d28871 100644
--- a/trunk/drivers/md/raid1.c
+++ b/trunk/drivers/md/raid1.c
@@ -1972,7 +1972,8 @@ static int run(mddev_t *mddev)
 		    !test_bit(In_sync, &disk->rdev->flags)) {
 			disk->head_position = 0;
 			mddev->degraded++;
-			conf->fullsync = 1;
+			if (disk->rdev)
+				conf->fullsync = 1;
 		}
 	}
 	if (mddev->degraded == conf->raid_disks) {