X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Assemble.c;h=1a1e1286db6f9e186be2da6136467b8da869a5fe;hb=66f5c4b66562cfbe0f0fb65a9bfabb17441ae23e;hp=3c3a004fc8045a67b16351a4bde7d7d3b67f8c04;hpb=e736b62389a230cc427e7cf352539d1afab8f469;p=thirdparty%2Fmdadm.git

diff --git a/Assemble.c b/Assemble.c
index 3c3a004f..1a1e1286 100644
--- a/Assemble.c
+++ b/Assemble.c
@@ -70,9 +70,70 @@ static int is_member_busy(char *metadata_version)
 	return busy;
 }
 
+static int ident_matches(struct mddev_ident *ident,
+			 struct mdinfo *content,
+			 struct supertype *tst,
+			 char *homehost,
+			 char *update, char *devname)
+{
+
+	if (ident->uuid_set && (!update || strcmp(update, "uuid")!= 0) &&
+	    same_uuid(content->uuid, ident->uuid, tst->ss->swapuuid)==0) {
+		if (devname)
+			fprintf(stderr, Name ": %s has wrong uuid.\n",
+				devname);
+		return 0;
+	}
+	if (ident->name[0] && (!update || strcmp(update, "name")!= 0) &&
+	    name_matches(content->name, ident->name, homehost)==0) {
+		if (devname)
+			fprintf(stderr, Name ": %s has wrong name.\n",
+				devname);
+		return 0;
+	}
+	if (ident->super_minor != UnSet &&
+	    ident->super_minor != content->array.md_minor) {
+		if (devname)
+			fprintf(stderr, Name ": %s has wrong super-minor.\n",
+				devname);
+		return 0;
+	}
+	if (ident->level != UnSet &&
+	    ident->level != content->array.level) {
+		if (devname)
+			fprintf(stderr, Name ": %s has wrong raid level.\n",
+				devname);
+		return 0;
+	}
+	if (ident->raid_disks != UnSet &&
+	    ident->raid_disks!= content->array.raid_disks) {
+		if (devname)
+			fprintf(stderr, Name ": %s requires wrong number of drives.\n",
+				devname);
+		return 0;
+	}
+	if (ident->member && ident->member[0]) {
+		/* content->text_version must match */
+		char *s = strchr(content->text_version+1, '/');
+		if (s == NULL) {
+			if (devname)
+				fprintf(stderr, Name ": %s is not a container and one is required.\n",
+					devname);
+			return 0;
+		} else if (strcmp(ident->member, s+1) != 0) {
+			if (devname)
+				fprintf(stderr, Name ": skipping wrong member %s is %s\n",
+					content->text_version, devname);
+			return 0;
+		}
+	}
+	return 1;
+}
+			 
+
 int Assemble(struct supertype *st, char *mddev,
-	     mddev_ident_t ident,
-	     mddev_dev_t devlist, char *backup_file,
+	     struct mddev_ident *ident,
+	     struct mddev_dev *devlist, char *backup_file,
 	     int readonly, int runstop,
 	     char *update, char *homehost, int require_homehost,
 	     int verbose, int force)
@@ -145,12 +206,13 @@ int Assemble(struct supertype *st, char *mddev,
 			       */
 		struct mdinfo i;
 	} *devices;
+	char *devmap;
 	int *best = NULL; /* indexed by raid_disk */
-	unsigned int bestcnt = 0;
+	int bestcnt = 0;
 	int devcnt = 0;
-	unsigned int okcnt, sparecnt;
+	unsigned int okcnt, sparecnt, rebuilding_cnt;
 	unsigned int req_cnt;
-	unsigned int i;
+	int i;
 	int most_recent = 0;
 	int chosen_drive;
 	int change = 0;
@@ -160,7 +222,7 @@ int Assemble(struct supertype *st, char *mddev,
 	int start_partial_ok = (runstop >= 0) && 
 		(force || devlist==NULL || auto_assem);
 	unsigned int num_devs;
-	mddev_dev_t tmpdev;
+	struct mddev_dev *tmpdev;
 	struct mdinfo info;
 	struct mdinfo *content = NULL;
 	char *avail;
@@ -182,7 +244,7 @@ int Assemble(struct supertype *st, char *mddev,
 
 	if (!devlist &&
 	    ident->uuid_set == 0 &&
-	    ident->super_minor < 0 &&
+	    (ident->super_minor < 0 || ident->super_minor == UnSet) &&
 	    ident->name[0] == 0 &&
 	    (ident->container == NULL || ident->member == NULL) &&
 	    ident->devices == NULL) {
@@ -211,7 +273,6 @@ int Assemble(struct supertype *st, char *mddev,
 			num_devs++;
 		tmpdev = tmpdev->next;
 	}
-	devices = malloc(num_devs * sizeof(*devices));
 
 	if (!st && ident->st) st = ident->st;
 
@@ -225,11 +286,13 @@ int Assemble(struct supertype *st, char *mddev,
 	 */
 	for (tmpdev = devlist;
 	     tmpdev;
-	     tmpdev = tmpdev->next) {
+	     tmpdev = tmpdev ? tmpdev->next : NULL) {
 		char *devname = tmpdev->devname;
 		int dfd;
 		struct stat stb;
 		struct supertype *tst = dup_super(st);
+		struct dev_policy *pol = NULL;
+		int found_container = 0;
 
 		if (tmpdev->used > 1) continue;
 
@@ -255,34 +318,7 @@ int Assemble(struct supertype *st, char *mddev,
 			fprintf(stderr, Name ": %s is not a block device.\n",
 				devname);
 			tmpdev->used = 2;
-		} else if (!tst && (tst = guess_super(dfd)) == NULL) {
-			if (report_missmatch)
-				fprintf(stderr, Name ": no recogniseable superblock on %s\n",
-					devname);
-			tmpdev->used = 2;
-		} else if (auto_assem && st == NULL &&
-			   !conf_test_metadata(tst->ss->name)) {
-			if (report_missmatch)
-				fprintf(stderr, Name ": %s has metadata type %s for which "
-					"auto-assembly is disabled\n",
-					devname, tst->ss->name);
-			tmpdev->used = 2;
-		} else if (tst->ss->load_super(tst,dfd, NULL)) {
-			if (report_missmatch)
-				fprintf( stderr, Name ": no RAID superblock on %s\n",
-					 devname);
-		} else {
-			content = &info;
-			memset(content, 0, sizeof(*content));
-			tst->ss->getinfo_super(tst, content);
-		}
-		if (dfd >= 0) close(dfd);
-
-		if (tst && tst->sb && tst->ss->container_content
-		    && tst->loaded_container) {
-			/* tmpdev is a container.  We need to be either
-			 * looking for a member, or auto-assembling
-			 */
+		} else if (must_be_container(dfd)) {
 			if (st) {
 				/* already found some components, this cannot
 				 * be another one.
@@ -290,8 +326,77 @@ int Assemble(struct supertype *st, char *mddev,
 				if (report_missmatch)
 					fprintf(stderr, Name ": %s is a container, but we are looking for components\n",
 						devname);
-				goto loop;
+				tmpdev->used = 2;
+			} if (!tst && (tst = super_by_fd(dfd, NULL)) == NULL) {
+				if (report_missmatch)
+					fprintf(stderr, Name ": not a recognisable container: %s\n",
+						devname);
+				tmpdev->used = 2;
+			} else if (tst->ss->load_container(tst, dfd, NULL)) {
+				if (report_missmatch)
+					fprintf(stderr, Name ": no correct container type: %s\n",
+						devname);
+				tmpdev->used = 2;
+			} else if (auto_assem &&
+				   !conf_test_metadata(tst->ss->name, (pol = devnum_policy(stb.st_rdev)),
+						       tst->ss->match_home(tst, homehost) == 1)) {
+				if (report_missmatch)
+					fprintf(stderr, Name ": %s has metadata type %s for which "
+						"auto-assembly is disabled\n",
+						devname, tst->ss->name);
+				tmpdev->used = 2;
+			} else
+				found_container = 1;
+		} else {
+			if (!tst && (tst = guess_super(dfd)) == NULL) {
+				if (report_missmatch)
+					fprintf(stderr, Name ": no recogniseable superblock on %s\n",
+						devname);
+				tmpdev->used = 2;
+			} else if (tst->ss->load_super(tst,dfd, NULL)) {
+				if (report_missmatch)
+					fprintf(stderr, Name ": no RAID superblock on %s\n",
+						devname);
+				tmpdev->used = 2;
+			} else if (tst->ss->compare_super == NULL) {
+				if (report_missmatch)
+					fprintf(stderr, Name ": Cannot assemble %s metadata on %s\n",
+						tst->ss->name, devname);
+				tmpdev->used = 2;
+			} else if (auto_assem && st == NULL &&
+				   !conf_test_metadata(tst->ss->name, (pol = devnum_policy(stb.st_rdev)),
+						       tst->ss->match_home(tst, homehost) == 1)) {
+				if (report_missmatch)
+					fprintf(stderr, Name ": %s has metadata type %s for which "
+						"auto-assembly is disabled\n",
+						devname, tst->ss->name);
+				tmpdev->used = 2;
 			}
+		}
+		if (dfd >= 0) close(dfd);
+		if (tmpdev->used == 2) {
+			if (auto_assem)
+				/* Ignore unrecognised devices during auto-assembly */
+				goto loop;
+			if (ident->uuid_set || ident->name[0] ||
+			    ident->super_minor != UnSet)
+				/* Ignore unrecognised device if looking for
+				 * specific array */
+				goto loop;
+			    
+
+			fprintf(stderr, Name ": %s has no superblock - assembly aborted\n",
+				devname);
+			if (st)
+				st->ss->free_super(st);
+			dev_policy_free(pol);
+			return 1;
+		}
+
+		if (found_container) {
+			/* tmpdev is a container.  We need to be either
+			 * looking for a member, or auto-assembling
+			 */
 
 			if (ident->container) {
 				if (ident->container[0] == '/' &&
@@ -315,161 +420,108 @@ int Assemble(struct supertype *st, char *mddev,
 			}
 			/* It is worth looking inside this container.
 			 */
-		next_member:
-			if (tmpdev->content)
-				content = tmpdev->content;
-			else
-				content = tst->ss->container_content(tst);
-
-			tmpdev->content = content->next;
-			if (tmpdev->content == NULL)
-				tmpdev->used = 2;
-
-		} else if (ident->container || ident->member) {
-			/* No chance of this matching if we don't have
-			 * a container */
-			if (report_missmatch)
-				fprintf(stderr, Name "%s is not a container, and one is required.\n",
-					devname);
-			goto loop;
-		}
-
-		if (ident->uuid_set && (!update || strcmp(update, "uuid")!= 0) &&
-		    (!tst || !tst->sb ||
-		     same_uuid(content->uuid, ident->uuid, tst->ss->swapuuid)==0)) {
-			if (report_missmatch)
-				fprintf(stderr, Name ": %s has wrong uuid.\n",
-					devname);
-			goto loop;
-		}
-		if (ident->name[0] && (!update || strcmp(update, "name")!= 0) &&
-		    (!tst || !tst->sb ||
-		     name_matches(content->name, ident->name, homehost)==0)) {
-			if (report_missmatch)
-				fprintf(stderr, Name ": %s has wrong name.\n",
-					devname);
-			goto loop;
-		}
-		if (ident->super_minor != UnSet &&
-		    (!tst || !tst->sb ||
-		     ident->super_minor != content->array.md_minor)) {
-			if (report_missmatch)
-				fprintf(stderr, Name ": %s has wrong super-minor.\n",
-					devname);
-			goto loop;
-		}
-		if (ident->level != UnSet &&
-		    (!tst || !tst->sb ||
-		     ident->level != content->array.level)) {
-			if (report_missmatch)
-				fprintf(stderr, Name ": %s has wrong raid level.\n",
+			if (verbose > 0)
+				fprintf(stderr, Name ": looking in container %s\n",
 					devname);
-			goto loop;
-		}
-		if (ident->raid_disks != UnSet &&
-		    (!tst || !tst->sb ||
-		     ident->raid_disks!= content->array.raid_disks)) {
-			if (report_missmatch)
-				fprintf(stderr, Name ": %s requires wrong number of drives.\n",
-					devname);
-			goto loop;
-		}
-		if (auto_assem) {
-			if (tst == NULL || tst->sb == NULL)
-				continue;
-		}
-		/* If we are this far, then we are nearly commited to this device.
-		 * If the super_block doesn't exist, or doesn't match others,
-		 * then we probably cannot continue
-		 * However if one of the arrays is for the homehost, and
-		 * the other isn't that can disambiguate.
-		 */
 
-		if (!tst || !tst->sb) {
-			fprintf(stderr, Name ": %s has no superblock - assembly aborted\n",
-				devname);
-			if (st)
-				st->ss->free_super(st);
-			return 1;
-		}
+			for (content = tst->ss->container_content(tst, NULL);
+			     content;
+			     content = content->next) {
 
-		if (tst && tst->sb && tst->ss->container_content
-		    && tst->loaded_container) {
-			/* we have the one container we need, don't keep
-			 * looking.  If the chosen member is active, skip.
-			 */
-			if (is_member_busy(content->text_version)) {
-				if (report_missmatch)
-					fprintf(stderr, Name ": member %s in %s is already assembled\n",
-						content->text_version,
-						devname);
-				tst->ss->free_super(tst);
-				tst = NULL;
-				content = NULL;
-				if (auto_assem)
-					goto loop;
-				return 1;
+				if (!ident_matches(ident, content, tst,
+						   homehost, update,
+						   report_missmatch ? devname : NULL))
+					/* message already printed */;
+				else if (is_member_busy(content->text_version)) {
+					if (report_missmatch)
+						fprintf(stderr, Name ": member %s in %s is already assembled\n",
+							content->text_version,
+							devname);
+				} else
+					break;
 			}
+			if (!content) {
+				tmpdev->used = 2;
+				goto loop; /* empty container */
+			}
+
 			st = tst; tst = NULL;
-			if (!auto_assem && tmpdev->next != NULL) {
+			if (!auto_assem && inargv && tmpdev->next != NULL) {
 				fprintf(stderr, Name ": %s is a container, but is not "
 					"only device given: confused and aborting\n",
 					devname);
 				st->ss->free_super(st);
+				dev_policy_free(pol);
 				return 1;
 			}
-			break;
-		}
-		if (st == NULL)
-			st = dup_super(tst);
-		if (st->minor_version == -1)
-			st->minor_version = tst->minor_version;
-		if (st->ss != tst->ss ||
-		    st->minor_version != tst->minor_version ||
-		    st->ss->compare_super(st, tst) != 0) {
-			/* Some mismatch. If exactly one array matches this host,
-			 * we can resolve on that one.
-			 * Or, if we are auto assembling, we just ignore the second
-			 * for now.
-			 */
-			if (auto_assem)
+			if (verbose > 0)
+				fprintf(stderr, Name ": found match on member %s in %s\n",
+					content->text_version, devname);
+
+			/* make sure we finished the loop */
+			tmpdev = NULL;
+			goto loop;
+		} else {
+
+			content = &info;
+			memset(content, 0, sizeof(*content));
+			tst->ss->getinfo_super(tst, content, NULL);
+
+			if (!ident_matches(ident, content, tst,
+					   homehost, update,
+					   report_missmatch ? devname : NULL))
 				goto loop;
-			if (homehost) {
-				int first = st->ss->match_home(st, homehost);
-				int last = tst->ss->match_home(tst, homehost);
-				if (first != last &&
-				    (first == 1 || last == 1)) {
-					/* We can do something */
-					if (first) {/* just ignore this one */
-						if (report_missmatch)
-							fprintf(stderr, Name ": %s misses out due to wrong homehost\n",
-								devname);
-						goto loop;
-					} else { /* reject all those sofar */
-						mddev_dev_t td;
-						if (report_missmatch)
-							fprintf(stderr, Name ": %s overrides previous devices due to good homehost\n",
-								devname);
-						for (td=devlist; td != tmpdev; td=td->next)
-							if (td->used == 1)
-								td->used = 0;
-						tmpdev->used = 1;
-						goto loop;
+
+			if (st == NULL)
+				st = dup_super(tst);
+			if (st->minor_version == -1)
+				st->minor_version = tst->minor_version;
+			if (st->ss != tst->ss ||
+			    st->minor_version != tst->minor_version ||
+			    st->ss->compare_super(st, tst) != 0) {
+				/* Some mismatch. If exactly one array matches this host,
+				 * we can resolve on that one.
+				 * Or, if we are auto assembling, we just ignore the second
+				 * for now.
+				 */
+				if (auto_assem)
+					goto loop;
+				if (homehost) {
+					int first = st->ss->match_home(st, homehost);
+					int last = tst->ss->match_home(tst, homehost);
+					if (first != last &&
+					    (first == 1 || last == 1)) {
+						/* We can do something */
+						if (first) {/* just ignore this one */
+							if (report_missmatch)
+								fprintf(stderr, Name ": %s misses out due to wrong homehost\n",
+									devname);
+							goto loop;
+						} else { /* reject all those sofar */
+							struct mddev_dev *td;
+							if (report_missmatch)
+								fprintf(stderr, Name ": %s overrides previous devices due to good homehost\n",
+									devname);
+							for (td=devlist; td != tmpdev; td=td->next)
+								if (td->used == 1)
+									td->used = 0;
+							tmpdev->used = 1;
+							goto loop;
+						}
 					}
 				}
+				fprintf(stderr, Name ": superblock on %s doesn't match others - assembly aborted\n",
+					devname);
+				tst->ss->free_super(tst);
+				st->ss->free_super(st);
+				dev_policy_free(pol);
+				return 1;
 			}
-			fprintf(stderr, Name ": superblock on %s doesn't match others - assembly aborted\n",
-				devname);
-			tst->ss->free_super(tst);
-			st->ss->free_super(st);
-			return 1;
+			tmpdev->used = 1;
 		}
-
-		tmpdev->used = 1;
-
 	loop:
-		if (tmpdev->content)
-			goto next_member;
+		dev_policy_free(pol);
+		pol = NULL;
 		if (tst)
 			tst->ss->free_super(tst);
 	}
@@ -479,7 +531,7 @@ int Assemble(struct supertype *st, char *mddev,
 
 	/* Now need to open the array device.  Use create_mddev */
 	if (content == &info)
-		st->ss->getinfo_super(st, content);
+		st->ss->getinfo_super(st, content, NULL);
 
 	trustworthy = FOREIGN;
 	name = content->name;
@@ -521,7 +573,6 @@ int Assemble(struct supertype *st, char *mddev,
 			    chosen_name);
 	if (mdfd < 0) {
 		st->ss->free_super(st);
-		free(devices);
 		if (auto_assem)
 			goto try_again;
 		return 1;
@@ -547,7 +598,6 @@ int Assemble(struct supertype *st, char *mddev,
 		close(mdfd);
 		mdfd = -3;
 		st->ss->free_super(st);
-		free(devices);
 		if (auto_assem)
 			goto try_again;
 		return 1;
@@ -563,6 +613,9 @@ int Assemble(struct supertype *st, char *mddev,
 #endif
 	/* Ok, no bad inconsistancy, we can try updating etc */
 	bitmap_done = 0;
+	content->update_private = NULL;
+	devices = malloc(num_devs * sizeof(*devices));
+	devmap = calloc(num_devs * content->array.raid_disks, 1);
 	for (tmpdev = devlist; tmpdev; tmpdev=tmpdev->next) if (tmpdev->used == 1) {
 		char *devname = tmpdev->devname;
 		struct stat stb;
@@ -573,6 +626,7 @@ int Assemble(struct supertype *st, char *mddev,
 			/* prepare useful information in info structures */
 			struct stat stb2;
 			struct supertype *tst;
+			int err;
 			fstat(mdfd, &stb2);
 
 			if (strcmp(update, "uuid")==0 &&
@@ -592,29 +646,51 @@ int Assemble(struct supertype *st, char *mddev,
 			remove_partitions(dfd);
 
 			tst = dup_super(st);
-			tst->ss->load_super(tst, dfd, NULL);
-			tst->ss->getinfo_super(tst, content);
+			if (dfd < 0 || tst->ss->load_super(tst, dfd, NULL) != 0) {
+				fprintf(stderr, Name ": cannot re-read metadata from %s - aborting\n",
+					devname);
+				if (dfd >= 0)
+					close(dfd);
+				close(mdfd);
+				free(devices);
+				free(devmap);
+				return 1;
+			}
+			tst->ss->getinfo_super(tst, content, devmap + devcnt * content->array.raid_disks);
 
 			memcpy(content->uuid, ident->uuid, 16);
 			strcpy(content->name, ident->name);
 			content->array.md_minor = minor(stb2.st_rdev);
 
-			tst->ss->update_super(tst, content, update,
-					      devname, verbose,
-					      ident->uuid_set, homehost);
+			if (strcmp(update, "byteorder") == 0)
+				err = 0;
+			else
+				err = tst->ss->update_super(tst, content, update,
+							    devname, verbose,
+							    ident->uuid_set,
+							    homehost);
+			if (err < 0) {
+				fprintf(stderr,
+					Name ": --update=%s not understood"
+					" for %s metadata\n",
+					update, tst->ss->name);
+				tst->ss->free_super(tst);
+				free(tst);
+				close(mdfd);
+				close(dfd);
+				free(devices);
+				free(devmap);
+				return 1;
+			}
 			if (strcmp(update, "uuid")==0 &&
 			    !ident->uuid_set) {
 				ident->uuid_set = 1;
 				memcpy(ident->uuid, content->uuid, 16);
 			}
-			if (dfd < 0)
-				fprintf(stderr, Name ": Cannot open %s for superblock update\n",
-					devname);
-			else if (tst->ss->store_super(tst, dfd))
+			if (tst->ss->store_super(tst, dfd))
 				fprintf(stderr, Name ": Could not re-write superblock on %s.\n",
 					devname);
-			if (dfd >= 0)
-				close(dfd);
+			close(dfd);
 
 			if (strcmp(update, "uuid")==0 &&
 			    ident->bitmap_fd >= 0 && !bitmap_done) {
@@ -635,8 +711,17 @@ int Assemble(struct supertype *st, char *mddev,
 
 			remove_partitions(dfd);
 
-			tst->ss->load_super(tst, dfd, NULL);
-			tst->ss->getinfo_super(tst, content);
+			if (dfd < 0 || tst->ss->load_super(tst, dfd, NULL) != 0) {
+				fprintf(stderr, Name ": cannot re-read metadata from %s - aborting\n",
+					devname);
+				if (dfd >= 0)
+					close(dfd);
+				close(mdfd);
+				free(devices);
+				free(devmap);
+				return 1;
+			}
+			tst->ss->getinfo_super(tst, content, devmap + devcnt * content->array.raid_disks);
 			tst->ss->free_super(tst);
 			close(dfd);
 		}
@@ -656,7 +741,7 @@ int Assemble(struct supertype *st, char *mddev,
 			    > devices[most_recent].i.events)
 				most_recent = devcnt;
 		}
-		if (content->array.level == -4)
+		if (content->array.level == LEVEL_MULTIPATH)
 			/* with multipath, the raid_disk from the superblock is meaningless */
 			i = devcnt;
 		else
@@ -672,9 +757,9 @@ int Assemble(struct supertype *st, char *mddev,
 		}
 		if (i < 10000) {
 			if (i >= bestcnt) {
-				unsigned int newbestcnt = i+10;
+				int newbestcnt = i+10;
 				int *newbest = malloc(sizeof(int)*newbestcnt);
-				unsigned int c;
+				int c;
 				for (c=0; c < newbestcnt; c++)
 					if (c < bestcnt)
 						newbest[c] = best[c];
@@ -706,6 +791,8 @@ int Assemble(struct supertype *st, char *mddev,
 					   "the\n      DEVICE list in mdadm.conf"
 					);
 				close(mdfd);
+				free(devices);
+				free(devmap);
 				return 1;
 			}
 			if (best[i] == -1
@@ -715,6 +802,8 @@ int Assemble(struct supertype *st, char *mddev,
 		}
 		devcnt++;
 	}
+	free(content->update_private);
+	content->update_private = NULL;
 
 	if (devcnt == 0) {
 		fprintf(stderr, Name ": no devices found for %s\n",
@@ -722,13 +811,15 @@ int Assemble(struct supertype *st, char *mddev,
 		if (st)
 			st->ss->free_super(st);
 		close(mdfd);
+		free(devices);
+		free(devmap);
 		return 1;
 	}
 
 	if (update && strcmp(update, "byteorder")==0)
 		st->minor_version = 90;
 
-	st->ss->getinfo_super(st, content);
+	st->ss->getinfo_super(st, content, NULL);
 	clean = content->array.state & 1;
 
 	/* now we have some devices that might be suitable.
@@ -738,7 +829,8 @@ int Assemble(struct supertype *st, char *mddev,
 	memset(avail, 0, content->array.raid_disks);
 	okcnt = 0;
 	sparecnt=0;
-	for (i=0; i< bestcnt ;i++) {
+	rebuilding_cnt=0;
+	for (i=0; i< bestcnt; i++) {
 		int j = best[i];
 		int event_margin = 1; /* always allow a difference of '1'
 				       * like the kernel does
@@ -747,23 +839,40 @@ int Assemble(struct supertype *st, char *mddev,
 		/* note: we ignore error flags in multipath arrays
 		 * as they don't make sense
 		 */
-		if (content->array.level != -4)
-			if (!(devices[j].i.disk.state & (1<<MD_DISK_SYNC))) {
+		if (content->array.level != LEVEL_MULTIPATH)
+			if (!(devices[j].i.disk.state & (1<<MD_DISK_ACTIVE))) {
 				if (!(devices[j].i.disk.state
 				      & (1<<MD_DISK_FAULTY)))
 					sparecnt++;
 				continue;
 			}
+		/* If this devices thinks that 'most_recent' has failed, then
+		 * we must reject this device.
+		 */
+		if (j != most_recent &&
+		    content->array.raid_disks > 0 &&
+		    devices[most_recent].i.disk.raid_disk >= 0 &&
+		    devmap[j * content->array.raid_disks + devices[most_recent].i.disk.raid_disk] == 0) {
+			if (verbose > -1)
+				fprintf(stderr, Name ": ignoring %s as it reports %s as failed\n",
+					devices[j].devname, devices[most_recent].devname);
+			best[i] = -1;
+			continue;
+		}
 		if (devices[j].i.events+event_margin >=
 		    devices[most_recent].i.events) {
 			devices[j].uptodate = 1;
 			if (i < content->array.raid_disks) {
-				okcnt++;
-				avail[i]=1;
+				if (devices[j].i.recovery_start == MaxSector) {
+					okcnt++;
+					avail[i]=1;
+				} else
+					rebuilding_cnt++;
 			} else
 				sparecnt++;
 		}
 	}
+	free(devmap);
 	while (force && !enough(content->array.level, content->array.raid_disks,
 				content->array.layout, 1,
 				avail, okcnt)) {
@@ -773,12 +882,13 @@ int Assemble(struct supertype *st, char *mddev,
 		 */
 		int fd;
 		struct supertype *tst;
-		long long current_events;
+		unsigned long long current_events;
 		chosen_drive = -1;
-		for (i=0; i<content->array.raid_disks && i < bestcnt; i++) {
+		for (i = 0; i < content->array.raid_disks && i < bestcnt; i++) {
 			int j = best[i];
 			if (j>=0 &&
 			    !devices[j].uptodate &&
+			    devices[j].i.recovery_start == MaxSector &&
 			    (chosen_drive < 0 ||
 			     devices[j].i.events
 			     > devices[chosen_drive].i.events))
@@ -832,7 +942,7 @@ int Assemble(struct supertype *st, char *mddev,
 		/* If there are any other drives of the same vintage,
 		 * add them in as well.  We can't lose and we might gain
 		 */
-		for (i=0; i<content->array.raid_disks && i < bestcnt ; i++) {
+		for (i = 0; i < content->array.raid_disks && i < bestcnt ; i++) {
 			int j = best[i];
 			if (j >= 0 &&
 			    !devices[j].uptodate &&
@@ -864,6 +974,7 @@ int Assemble(struct supertype *st, char *mddev,
 			fprintf(stderr, Name ": Cannot open %s: %s\n",
 				devices[j].devname, strerror(errno));
 			close(mdfd);
+			free(devices);
 			return 1;
 		}
 		if (st->ss->load_super(st,fd, NULL)) {
@@ -871,6 +982,7 @@ int Assemble(struct supertype *st, char *mddev,
 			fprintf(stderr, Name ": RAID superblock has disappeared from %s\n",
 				devices[j].devname);
 			close(mdfd);
+			free(devices);
 			return 1;
 		}
 		close(fd);
@@ -878,9 +990,10 @@ int Assemble(struct supertype *st, char *mddev,
 	if (st->sb == NULL) {
 		fprintf(stderr, Name ": No suitable drives found for %s\n", mddev);
 		close(mdfd);
+		free(devices);
 		return 1;
 	}
-	st->ss->getinfo_super(st, content);
+	st->ss->getinfo_super(st, content, NULL);
 #ifndef MDASSEMBLE
 	sysfs_init(content, mdfd, 0);
 #endif
@@ -941,6 +1054,7 @@ int Assemble(struct supertype *st, char *mddev,
 			fprintf(stderr, Name ": Could not open %s for write - cannot Assemble array.\n",
 				devices[chosen_drive].devname);
 			close(mdfd);
+			free(devices);
 			return 1;
 		}
 		if (st->ss->store_super(st, fd)) {
@@ -948,6 +1062,7 @@ int Assemble(struct supertype *st, char *mddev,
 			fprintf(stderr, Name ": Could not re-write superblock on %s\n",
 				devices[chosen_drive].devname);
 			close(mdfd);
+			free(devices);
 			return 1;
 		}
 		close(fd);
@@ -961,6 +1076,10 @@ int Assemble(struct supertype *st, char *mddev,
 	if (content->reshape_active) {
 		int err = 0;
 		int *fdlist = malloc(sizeof(int)* bestcnt);
+		if (verbose > 0)
+			fprintf(stderr, Name ":%s has an active reshape - checking "
+				"if critical section needs to be restored\n",
+				chosen_name);
 		for (i=0; i<bestcnt; i++) {
 			int j = best[i];
 			if (j >= 0) {
@@ -975,14 +1094,17 @@ int Assemble(struct supertype *st, char *mddev,
 				fdlist[i] = -1;
 		}
 		if (!err)
-			err = Grow_restart(st, content, fdlist, bestcnt, backup_file);
+			err = Grow_restart(st, content, fdlist, bestcnt, backup_file, verbose > 0);
 		while (i>0) {
 			i--;
 			if (fdlist[i]>=0) close(fdlist[i]);
 		}
 		if (err) {
 			fprintf(stderr, Name ": Failed to restore critical section for reshape, sorry.\n");
+			if (backup_file == NULL)
+				fprintf(stderr,"      Possibly you needed to specify the --backup-file\n");
 			close(mdfd);
+			free(devices);
 			return err;
 		}
 	}
@@ -1006,13 +1128,17 @@ int Assemble(struct supertype *st, char *mddev,
 		if (rv) {
 			fprintf(stderr, Name ": failed to set array info for %s: %s\n",
 				mddev, strerror(errno));
+			ioctl(mdfd, STOP_ARRAY, NULL);
 			close(mdfd);
+			free(devices);
 			return 1;
 		}
 		if (ident->bitmap_fd >= 0) {
 			if (ioctl(mdfd, SET_BITMAP_FILE, ident->bitmap_fd) != 0) {
 				fprintf(stderr, Name ": SET_BITMAP_FILE failed.\n");
+				ioctl(mdfd, STOP_ARRAY, NULL);
 				close(mdfd);
+				free(devices);
 				return 1;
 			}
 		} else if (ident->bitmap_file) {
@@ -1021,13 +1147,17 @@ int Assemble(struct supertype *st, char *mddev,
 			if (bmfd < 0) {
 				fprintf(stderr, Name ": Could not open bitmap file %s\n",
 					ident->bitmap_file);
+				ioctl(mdfd, STOP_ARRAY, NULL);
 				close(mdfd);
+				free(devices);
 				return 1;
 			}
 			if (ioctl(mdfd, SET_BITMAP_FILE, bmfd) != 0) {
 				fprintf(stderr, Name ": Failed to set bitmapfile for %s\n", mddev);
 				close(bmfd);
+				ioctl(mdfd, STOP_ARRAY, NULL);
 				close(mdfd);
+				free(devices);
 				return 1;
 			}
 			close(bmfd);
@@ -1073,7 +1203,7 @@ int Assemble(struct supertype *st, char *mddev,
 				fprintf(stderr, Name ": Container %s has been "
 					"assembled with %d drive%s",
 					mddev, okcnt+sparecnt, okcnt+sparecnt==1?"":"s");
-				if (okcnt < content->array.raid_disks)
+				if (okcnt < (unsigned)content->array.raid_disks)
 					fprintf(stderr, " (out of %d)",
 						content->array.raid_disks);
 				fprintf(stderr, "\n");
@@ -1081,6 +1211,7 @@ int Assemble(struct supertype *st, char *mddev,
 			sysfs_uevent(content, "change");
 			wait_for(chosen_name, mdfd);
 			close(mdfd);
+			free(devices);
 			return 0;
 		}
 
@@ -1088,14 +1219,29 @@ int Assemble(struct supertype *st, char *mddev,
 		    (runstop <= 0 &&
 		     ( enough(content->array.level, content->array.raid_disks,
 			      content->array.layout, clean, avail, okcnt) &&
-		       (okcnt >= req_cnt || start_partial_ok)
+		       (okcnt + rebuilding_cnt >= req_cnt || start_partial_ok)
 			     ))) {
-			if (ioctl(mdfd, RUN_ARRAY, NULL)==0) {
+			/* This array is good-to-go.
+			 * If a reshape is in progress then we might need to
+			 * continue monitoring it.  In that case we start
+			 * it read-only and let the grow code make it writable.
+			 */
+			int rv;
+#ifndef MDASSEMBLE
+			if (content->reshape_active &&
+			    content->delta_disks <= 0)
+				rv = Grow_continue(mdfd, st, content, backup_file);
+			else
+#endif
+				rv = ioctl(mdfd, RUN_ARRAY, NULL);
+			if (rv == 0) {
 				if (verbose >= 0) {
 					fprintf(stderr, Name ": %s has been started with %d drive%s",
 						mddev, okcnt, okcnt==1?"":"s");
-					if (okcnt < content->array.raid_disks)
+					if (okcnt < (unsigned)content->array.raid_disks)
 						fprintf(stderr, " (out of %d)", content->array.raid_disks);
+					if (rebuilding_cnt)
+						fprintf(stderr, "%s %d rebuilding", sparecnt?",":" and", rebuilding_cnt);
 					if (sparecnt)
 						fprintf(stderr, " and %d spare%s", sparecnt, sparecnt==1?"":"s");
 					fprintf(stderr, ".\n");
@@ -1114,6 +1260,29 @@ int Assemble(struct supertype *st, char *mddev,
 								      (4 * content->array.chunk_size / 4096) + 1);
 					}
 				}
+				if (okcnt < (unsigned)content->array.raid_disks) {
+					/* If any devices did not get added
+					 * because the kernel rejected them based
+					 * on event count, try adding them
+					 * again providing the action policy is
+					 * 're-add' or greater.  The bitmap
+					 * might allow them to be included, or
+					 * they will become spares.
+					 */
+					for (i = 0; i <= bestcnt; i++) {
+						int j = best[i];
+						if (j >= 0 && !devices[j].uptodate) {
+							if (!disk_action_allows(&devices[j].i, st->ss->name, act_re_add))
+								continue;
+							rv = add_disk(mdfd, st, content,
+								      &devices[j].i);
+							if (rv == 0 && verbose >= 0)
+								fprintf(stderr,
+									Name ": %s has been re-added.\n",
+									devices[j].devname);
+						}
+					}
+				}
 				wait_for(mddev, mdfd);
 				close(mdfd);
 				if (auto_assem) {
@@ -1142,6 +1311,7 @@ int Assemble(struct supertype *st, char *mddev,
 						usecs <<= 1;
 					}
 				}
+				free(devices);
 				return 0;
 			}
 			fprintf(stderr, Name ": failed to RUN_ARRAY %s: %s\n",
@@ -1162,19 +1332,23 @@ int Assemble(struct supertype *st, char *mddev,
 			if (auto_assem)
 				ioctl(mdfd, STOP_ARRAY, NULL);
 			close(mdfd);
+			free(devices);
 			return 1;
 		}
 		if (runstop == -1) {
 			fprintf(stderr, Name ": %s assembled from %d drive%s",
 				mddev, okcnt, okcnt==1?"":"s");
-			if (okcnt != content->array.raid_disks)
+			if (okcnt != (unsigned)content->array.raid_disks)
 				fprintf(stderr, " (out of %d)", content->array.raid_disks);
 			fprintf(stderr, ", but not started.\n");
 			close(mdfd);
+			free(devices);
 			return 0;
 		}
 		if (verbose >= -1) {
 			fprintf(stderr, Name ": %s assembled from %d drive%s", mddev, okcnt, okcnt==1?"":"s");
+			if (rebuilding_cnt)
+				fprintf(stderr, "%s %d rebuilding", sparecnt?", ":" and ", rebuilding_cnt);
 			if (sparecnt)
 				fprintf(stderr, " and %d spare%s", sparecnt, sparecnt==1?"":"s");
 			if (!enough(content->array.level, content->array.raid_disks,
@@ -1188,7 +1362,7 @@ int Assemble(struct supertype *st, char *mddev,
 					"array while not clean - consider "
 					"--force.\n");
 			else {
-				if (req_cnt == content->array.raid_disks)
+				if (req_cnt == (unsigned)content->array.raid_disks)
 					fprintf(stderr, " - need all %d to start it", req_cnt);
 				else
 					fprintf(stderr, " - need %d of %d to start", req_cnt, content->array.raid_disks);
@@ -1198,6 +1372,7 @@ int Assemble(struct supertype *st, char *mddev,
 		if (auto_assem)
 			ioctl(mdfd, STOP_ARRAY, NULL);
 		close(mdfd);
+		free(devices);
 		return 1;
 	} else {
 		/* The "chosen_drive" is a good choice, and if necessary, the superblock has
@@ -1214,6 +1389,7 @@ int Assemble(struct supertype *st, char *mddev,
 
 	}
 	close(mdfd);
+	free(devices);
 	return 0;
 }