From: NeilBrown <neilb@suse.de>
Date: Tue, 7 Apr 2009 07:45:42 +0000 (+1000)
Subject: Assemble: call map_update even when not starting the array.
X-Git-Tag: mdadm-3.0-rc1~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b4e5ea926a081d870af85fe5d304bcac48d9f57;p=thirdparty%2Fmdadm.git

Assemble: call map_update even when not starting the array.

For incremental assembly to work, we need to keep the 'map'
up-to-date even when not starting the array yet.

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/Assemble.c b/Assemble.c
index 172bc53e..73d6ee23 100644
--- a/Assemble.c
+++ b/Assemble.c
@@ -1235,13 +1235,16 @@ int assemble_container_content(struct supertype *st, int mdfd,
 	if (working == 0) {
 		close(mdfd);
 		return 1;/* Nothing new, don't try to start */
-	} else if (runstop > 0 ||
+	}
+	
+	map_update(&map, fd2devnum(mdfd),
+		   content->text_version,
+		   content->uuid, chosen_name);
+
+	if (runstop > 0 ||
 		 (working + preexist) >= content->array.working_disks) {
 		int err;
 
-		map_update(&map, fd2devnum(mdfd),
-			   content->text_version,
-			   content->uuid, chosen_name);
 		switch(content->array.level) {
 		case LEVEL_LINEAR:
 		case LEVEL_MULTIPATH: