X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=Incremental.c;h=8c686f7e8e6bde1d426d8731f3bdeca8a9d5c1d3;hp=8619c28e02e097669f7728356b8cb45d6ab71573;hb=24f6f99b3630b1a89aaa57930c5c9de8a3df9ded;hpb=5c8d7dc132ff0059a4447f85562dbdcf43d1146e

diff --git a/Incremental.c b/Incremental.c
index 8619c28e..8c686f7e 100644
--- a/Incremental.c
+++ b/Incremental.c
@@ -2,7 +2,7 @@
  * Incremental.c - support --incremental.  Part of:
  * mdadm - manage Linux "md" devices aka RAID arrays.
  *
- * Copyright (C) 2006 Neil Brown <neilb@suse.de>
+ * Copyright (C) 2006-2009 Neil Brown <neilb@suse.de>
  *
  *
  *    This program is free software; you can redistribute it and/or modify
@@ -37,7 +37,8 @@ static void find_reject(int mdfd, struct supertype *st, struct mdinfo *sra,
 			char *array_name);
 
 int Incremental(char *devname, int verbose, int runstop,
-		struct supertype *st, char *homehost, int autof)
+		struct supertype *st, char *homehost, int require_homehost,
+		int autof)
 {
 	/* Add this device to an array, creating the array if necessary
 	 * and starting the array if sensible or - if runstop>0 - if possible.
@@ -48,7 +49,8 @@ int Incremental(char *devname, int verbose, int runstop,
 	 * 2/ Find metadata, reject if none appropriate (check
 	 *       version/name from args)
 	 * 3/ Check if there is a match in mdadm.conf
-	 * 3a/ if not, check for homehost match.  If no match, reject.
+	 * 3a/ if not, check for homehost match.  If no match, assemble as
+	 *    a 'foreign' array.
 	 * 4/ Determine device number.
 	 * - If in mdadm.conf with std name, use that
 	 * - UUID in /var/run/mdadm.map  use that
@@ -80,14 +82,13 @@ int Incremental(char *devname, int verbose, int runstop,
 	struct mddev_ident_s *array_list, *match;
 	char chosen_name[1024];
 	int rv;
-	int devnum;
 	struct map_ent *mp, *map = NULL;
 	int dfd, mdfd;
 	char *avail;
 	int active_disks;
-	int uuid_for_name = 0;
+	int trustworthy = FOREIGN;
 	char *name_to_use;
-	char nbuf[64];
+	mdu_array_info_t ainf;
 
 	struct createinfo *ci = conf_get_create_info();
 
@@ -144,14 +145,6 @@ int Incremental(char *devname, int verbose, int runstop,
 	}
 	close (dfd);
 
-	if (st->ss->container_content && st->loaded_container) {
-		/* This is a pre-built container array, so we do something
-		 * rather different.
-		 */
-		return Incremental_container(st, devname, verbose, runstop,
-					     autof);
-	}
-
 	memset(&info, 0, sizeof(info));
 	st->ss->getinfo_super(st, &info);
 	/* 3/ Check if there is a match in mdadm.conf */
@@ -162,7 +155,7 @@ int Incremental(char *devname, int verbose, int runstop,
 		if (array_list->uuid_set &&
 		    same_uuid(array_list->uuid, info.uuid, st->ss->swapuuid)
 		    == 0) {
-			if (verbose >= 2)
+			if (verbose >= 2 && array_list->devname)
 				fprintf(stderr, Name
 					": UUID differs from %s.\n",
 					array_list->devname);
@@ -170,7 +163,7 @@ int Incremental(char *devname, int verbose, int runstop,
 		}
 		if (array_list->name[0] &&
 		    strcasecmp(array_list->name, info.name) != 0) {
-			if (verbose >= 2)
+			if (verbose >= 2 && array_list->devname)
 				fprintf(stderr, Name
 					": Name differs from %s.\n",
 					array_list->devname);
@@ -178,7 +171,7 @@ int Incremental(char *devname, int verbose, int runstop,
 		}
 		if (array_list->devices &&
 		    !match_oneof(array_list->devices, devname)) {
-			if (verbose >= 2)
+			if (verbose >= 2 && array_list->devname)
 				fprintf(stderr, Name
 					": Not a listed device for %s.\n",
 					array_list->devname);
@@ -186,7 +179,7 @@ int Incremental(char *devname, int verbose, int runstop,
 		}
 		if (array_list->super_minor != UnSet &&
 		    array_list->super_minor != info.array.md_minor) {
-			if (verbose >= 2)
+			if (verbose >= 2 && array_list->devname)
 				fprintf(stderr, Name
 					": Different super-minor to %s.\n",
 					array_list->devname);
@@ -196,7 +189,7 @@ int Incremental(char *devname, int verbose, int runstop,
 		    !array_list->name[0] &&
 		    !array_list->devices &&
 		    array_list->super_minor == UnSet) {
-			if (verbose  >= 2)
+			if (verbose >= 2 && array_list->devname)
 				fprintf(stderr, Name
 			     ": %s doesn't have any identifying information.\n",
 					array_list->devname);
@@ -205,42 +198,50 @@ int Incremental(char *devname, int verbose, int runstop,
 		/* FIXME, should I check raid_disks and level too?? */
 
 		if (match) {
-			if (verbose >= 0)
-				fprintf(stderr, Name
+			if (verbose >= 0) {
+				if (match->devname && array_list->devname)
+					fprintf(stderr, Name
 		   ": we match both %s and %s - cannot decide which to use.\n",
-					match->devname, array_list->devname);
+						match->devname, array_list->devname);
+				else
+					fprintf(stderr, Name
+						": multiple lines in mdadm.conf match\n");
+			}
 			return 2;
 		}
 		match = array_list;
 	}
 
+	if (match && match->devname
+	    && strcasecmp(match->devname, "<ignore>") == 0) {
+		if (verbose >= 0)
+			fprintf(stderr, Name ": array containing %s is explicitly"
+				" ignored by mdadm.conf\n",
+				devname);
+		return 1;
+	}
+
+	if (!match && !conf_test_metadata(st->ss->name)) {
+		if (verbose >= 1)
+			fprintf(stderr, Name
+				": %s has metadata type %s for which "
+				"auto-assembly is disabled\n",
+				devname, st->ss->name);
+		return 1;
+	}
+
 	/* 3a/ if not, check for homehost match.  If no match, continue
 	 * but don't trust the 'name' in the array. Thus a 'random' minor
 	 * number will be assigned, and the device name will be based
 	 * on that. */
-	if (!match) {
-		if (homehost == NULL ||
-		       st->ss->match_home(st, homehost) != 1)
-			uuid_for_name = 1;
-	}
-	/* 4/ Determine device number. */
-	/* - If in mdadm.conf with std name, get number from name. */
-	/* - UUID in /var/run/mdadm.map  get number from mapping */
-	/* - If name is suggestive, use that. unless in use with */
-	/*           different uuid. */
-	/* - Choose a free, high number. */
-	/* - Use a partitioned device unless strong suggestion not to. */
-	/*         e.g. auto=md */
-	mp = map_by_uuid(&map, info.uuid);
-
-	if (uuid_for_name && ! mp) {
-		name_to_use = fname_from_uuid(st, &info, nbuf, '-');
-		if (verbose >= 0)
-			fprintf(stderr, Name
-		": not found in mdadm.conf and not identified by homehost"
-				" - using uuid based name\n");
-	} else
-		name_to_use = info.name;
+	if (match)
+		trustworthy = LOCAL;
+	else if ((homehost == NULL ||
+		  st->ss->match_home(st, homehost) != 1) &&
+		 st->ss->match_home(st, "any") != 1)
+		trustworthy = FOREIGN;
+	else
+		trustworthy = LOCAL;
 
 	/* There are three possible sources for 'autof':  command line,
 	 * ARRAY line in mdadm.conf, or CREATE line in mdadm.conf.
@@ -252,85 +253,54 @@ int Incremental(char *devname, int verbose, int runstop,
 	if (autof == 0)
 		autof = ci->autof;
 
-	if (match && (rv = is_standard(match->devname, &devnum))) {
-		devnum = (rv > 0) ? (-1-devnum) : devnum;
-	} else if (mp != NULL)
-		devnum = mp->devnum;
-	else {
-		/* Have to guess a bit. */
-		int use_partitions = 1;
-		char *np, *ep;
-		char *nm, nbuf[1024];
-		struct stat stb2;
-
-		if ((autof&7) == 3 || (autof&7) == 5)
-			use_partitions = 0;
-		if (st->ss->external)
-			use_partitions = 0;
-		np = strchr(name_to_use, ':');
-		if (np)
-			np++;
-		else
-			np = name_to_use;
-		devnum = strtoul(np, &ep, 10);
-		if (ep > np && *ep == 0) {
-			/* This is a number.  Let check that it is unused. */
-			if (mddev_busy(use_partitions ? (-1-devnum) : devnum))
-				devnum = -1;
-		} else
-			devnum = -1;
-
-		if (match)
-			nm = match->devname;
-		else {
-			sprintf(nbuf, "/dev/md/%s", np);
-			nm = nbuf;
-		}
-		if (stat(nm, &stb2) == 0 &&
-		    S_ISBLK(stb2.st_mode) &&
-		    major(stb2.st_rdev) == (use_partitions ?
-					    get_mdp_major() : MD_MAJOR)) {
-			if (use_partitions)
-				devnum = minor(stb2.st_rdev) >> MdpMinorShift;
-			else
-				devnum = minor(stb2.st_rdev);
-			if (mddev_busy(use_partitions ? (-1-devnum) : devnum))
-				devnum = -1;
-		}
-
-		if (devnum < 0) {
-			/* Haven't found anything yet, choose something free */
-			devnum = find_free_devnum(use_partitions);
-
-			if (devnum == NoMdDev) {
-				fprintf(stderr, Name
-					": No spare md devices!!\n");
-				return 2;
-			}
-		} else
-			devnum = use_partitions ? (-1-devnum) : devnum;
+	if (st->ss->container_content && st->loaded_container) {
+		/* This is a pre-built container array, so we do something
+		 * rather different.
+		 */
+		return Incremental_container(st, devname, verbose, runstop,
+					     autof, trustworthy);
 	}
 
-	mdfd = open_mddev_devnum(match ? match->devname : mp ? mp->path : NULL,
-				 devnum,
-				 name_to_use,
-				 chosen_name, autof >> 3);
-	if (mdfd < 0) {
-		fprintf(stderr, Name ": failed to open %s: %s.\n",
-			chosen_name, strerror(errno));
-		return 2;
+	name_to_use = info.name;
+	if (name_to_use[0] == 0 &&
+	    info.array.level == LEVEL_CONTAINER &&
+	    trustworthy == LOCAL) {
+		name_to_use = info.text_version;
+		trustworthy = METADATA;
 	}
-	sysfs_init(&info, mdfd, 0);
+	if (name_to_use[0] && trustworthy != LOCAL &&
+	    ! require_homehost &&
+	    conf_name_is_free(name_to_use))
+		trustworthy = LOCAL;
 
-	/* 5/ Find out if array already exists */
-	if (! mddev_busy(devnum)) {
-	/* 5a/ if it does not */
-	/* - choose a name, from mdadm.conf or 'name' field in array. */
-	/* - create the array */
-	/* - add the device */
+	/* strip "hostname:" prefix from name if we have decided
+	 * to treat it as LOCAL
+	 */
+	if (trustworthy == LOCAL && strchr(name_to_use, ':') != NULL)
+		name_to_use = strchr(name_to_use, ':')+1;
+
+	/* 4/ Check if array exists.
+	 */
+	map_lock(&map);
+	mp = map_by_uuid(&map, info.uuid);
+	if (mp)
+		mdfd = open_dev(mp->devnum);
+	else
+		mdfd = -1;
+
+	if (mdfd < 0) {
 		struct mdinfo *sra;
 		struct mdinfo dinfo;
 
+		/* Couldn't find an existing array, maybe make a new one */
+		mdfd = create_mddev(match ? match->devname : NULL,
+				    name_to_use, autof, trustworthy, chosen_name);
+
+		if (mdfd < 0)
+			return 1;
+
+		sysfs_init(&info, mdfd, 0);
+
 		if (set_array_info(mdfd, st, &info) != 0) {
 			fprintf(stderr, Name ": failed to set array info for %s: %s\n",
 				chosen_name, strerror(errno));
@@ -348,7 +318,7 @@ int Incremental(char *devname, int verbose, int runstop,
 			close(mdfd);
 			return 2;
 		}
-		sra = sysfs_read(mdfd, devnum, GET_DEVS);
+		sra = sysfs_read(mdfd, fd2devnum(mdfd), GET_DEVS);
 		if (!sra || !sra->devs || sra->devs->disk.raid_disk >= 0) {
 			/* It really should be 'none' - must be old buggy
 			 * kernel, and mdadm -I may not be able to complete.
@@ -364,6 +334,10 @@ int Incremental(char *devname, int verbose, int runstop,
 		}
 		info.array.working_disks = 1;
 		sysfs_free(sra);
+		/* 6/ Make sure /var/run/mdadm.map contains this array. */
+		map_update(&map, fd2devnum(mdfd),
+			   info.text_version,
+			   info.uuid, chosen_name);
 	} else {
 	/* 5b/ if it does */
 	/* - check one drive in array to make sure metadata is a reasonably */
@@ -375,48 +349,56 @@ int Incremental(char *devname, int verbose, int runstop,
 		struct mdinfo *sra;
 		struct supertype *st2;
 		struct mdinfo info2, *d;
-		sra = sysfs_read(mdfd, devnum, (GET_DEVS | GET_STATE));
-
-		sprintf(dn, "%d:%d", sra->devs->disk.major,
-			sra->devs->disk.minor);
-		dfd2 = dev_open(dn, O_RDONLY);
-		st2 = dup_super(st);
-		if (st2->ss->load_super(st2, dfd2, NULL) ||
-		    st->ss->compare_super(st, st2) != 0) {
-			fprintf(stderr, Name
-				": metadata mismatch between %s and "
-				"chosen array %s\n",
-				devname, chosen_name);
-			close(mdfd);
+
+		if (mp->path)
+			strcpy(chosen_name, mp->path);
+		else
+			strcpy(chosen_name, devnum2devname(mp->devnum));
+
+		sra = sysfs_read(mdfd, fd2devnum(mdfd), (GET_DEVS | GET_STATE));
+
+		if (sra->devs) {
+			sprintf(dn, "%d:%d", sra->devs->disk.major,
+				sra->devs->disk.minor);
+			dfd2 = dev_open(dn, O_RDONLY);
+			st2 = dup_super(st);
+			if (st2->ss->load_super(st2, dfd2, NULL) ||
+			    st->ss->compare_super(st, st2) != 0) {
+				fprintf(stderr, Name
+					": metadata mismatch between %s and "
+					"chosen array %s\n",
+					devname, chosen_name);
+				close(mdfd);
+				close(dfd2);
+				return 2;
+			}
 			close(dfd2);
-			return 2;
-		}
-		close(dfd2);
-		memset(&info2, 0, sizeof(info2));
-		st2->ss->getinfo_super(st2, &info2);
-		st2->ss->free_super(st2);
-		if (info.array.level != info2.array.level ||
-		    memcmp(info.uuid, info2.uuid, 16) != 0 ||
-		    info.array.raid_disks != info2.array.raid_disks) {
-			fprintf(stderr, Name
-				": unexpected difference between %s and %s.\n",
-				chosen_name, devname);
-			close(mdfd);
-			return 2;
+			memset(&info2, 0, sizeof(info2));
+			st2->ss->getinfo_super(st2, &info2);
+			st2->ss->free_super(st2);
+			if (info.array.level != info2.array.level ||
+			    memcmp(info.uuid, info2.uuid, 16) != 0 ||
+			    info.array.raid_disks != info2.array.raid_disks) {
+				fprintf(stderr, Name
+					": unexpected difference between %s and %s.\n",
+					chosen_name, devname);
+				close(mdfd);
+				return 2;
+			}
 		}
 		info2.disk.major = major(stb.st_rdev);
 		info2.disk.minor = minor(stb.st_rdev);
 		/* add disk needs to know about containers */
 		if (st->ss->external)
 			sra->array.level = LEVEL_CONTAINER;
-		err = add_disk(mdfd, st2, sra, &info2);
+		err = add_disk(mdfd, st, sra, &info2);
 		if (err < 0 && errno == EBUSY) {
 			/* could be another device present with the same
 			 * disk.number. Find and reject any such
 			 */
 			find_reject(mdfd, st, sra, info.disk.number,
 				    info.events, verbose, chosen_name);
-			err = add_disk(mdfd, st2, sra, &info2);
+			err = add_disk(mdfd, st, sra, &info2);
 		}
 		if (err < 0) {
 			fprintf(stderr, Name ": failed to add %s to %s: %s.\n",
@@ -429,33 +411,42 @@ int Incremental(char *devname, int verbose, int runstop,
 			info.array.working_disks ++;
 			
 	}
-	/* 6/ Make sure /var/run/mdadm.map contains this array. */
-	map_update(&map, devnum,
-		   info.text_version,
-		   info.uuid, chosen_name);
 
 	/* 7/ Is there enough devices to possibly start the array? */
 	/* 7a/ if not, finish with success. */
 	if (info.array.level == LEVEL_CONTAINER) {
 		/* Try to assemble within the container */
-		close(mdfd);
+		map_unlock(&map);
+		sysfs_uevent(&info, "change");
 		if (verbose >= 0)
 			fprintf(stderr, Name
 				": container %s now has %d devices\n",
 				chosen_name, info.array.working_disks);
-		return Incremental(chosen_name, verbose, runstop,
-				   NULL, homehost, autof);
+		wait_for(chosen_name, mdfd);
+		close(mdfd);
+		if (runstop < 0)
+			return 0; /* don't try to assemble */
+		rv = Incremental(chosen_name, verbose, runstop,
+				 NULL, homehost, require_homehost, autof);
+		if (rv == 1)
+			/* Don't fail the whole -I if a subarray didn't
+			 * have enough devices to start yet
+			 */
+			rv = 0;
+		return rv;
 	}
 	avail = NULL;
 	active_disks = count_active(st, mdfd, &avail, &info);
 	if (enough(info.array.level, info.array.raid_disks,
 		   info.array.layout, info.array.state & 1,
-		   avail, active_disks) == 0) {
+		   avail, active_disks) == 0 ||
+	    (runstop < 0 && active_disks < info.array.raid_disks)) {
 		free(avail);
 		if (verbose >= 0)
 			fprintf(stderr, Name
 			     ": %s attached to %s, not enough to start (%d).\n",
 				devname, chosen_name, active_disks);
+		map_unlock(&map);
 		close(mdfd);
 		return 0;
 	}
@@ -466,18 +457,18 @@ int Incremental(char *devname, int verbose, int runstop,
 	/*             are enough, */
 	/*   + add any bitmap file  */
 	/*   + start the array (auto-readonly). */
-{
-	mdu_array_info_t ainf;
 
 	if (ioctl(mdfd, GET_ARRAY_INFO, &ainf) == 0) {
 		if (verbose >= 0)
 			fprintf(stderr, Name
 			   ": %s attached to %s which is already active.\n",
 				devname, chosen_name);
-		close (mdfd);
+		close(mdfd);
+		map_unlock(&map);
 		return 0;
 	}
-}
+
+	map_unlock(&map);
 	if (runstop > 0 || active_disks >= info.array.working_disks) {
 		struct mdinfo *sra;
 		/* Let's try to start it */
@@ -500,9 +491,9 @@ int Incremental(char *devname, int verbose, int runstop,
 			}
 			close(bmfd);
 		}
-		sra = sysfs_read(mdfd, devnum, 0);
+		sra = sysfs_read(mdfd, fd2devnum(mdfd), 0);
 		if ((sra == NULL || active_disks >= info.array.working_disks)
-		    && uuid_for_name == 0)
+		    && trustworthy != FOREIGN)
 			rv = ioctl(mdfd, RUN_ARRAY, NULL);
 		else
 			rv = sysfs_set_str(sra, NULL,
@@ -513,6 +504,7 @@ int Incremental(char *devname, int verbose, int runstop,
 			   ": %s attached to %s, which has been started.\n",
 					devname, chosen_name);
 			rv = 0;
+			wait_for(chosen_name, mdfd);
 		} else {
 			fprintf(stderr, Name
                              ": %s attached to %s, but failed to start: %s.\n",
@@ -646,53 +638,6 @@ static int count_active(struct supertype *st, int mdfd, char **availp,
 	return cnt + cnt1;
 }
 
-void RebuildMap(void)
-{
-	struct mdstat_ent *mdstat = mdstat_read(0, 0);
-	struct mdstat_ent *md;
-	struct map_ent *map = NULL;
-	int mdp = get_mdp_major();
-
-	for (md = mdstat ; md ; md = md->next) {
-		struct mdinfo *sra = sysfs_read(-1, md->devnum, GET_DEVS);
-		struct mdinfo *sd;
-
-		for (sd = sra->devs ; sd ; sd = sd->next) {
-			char dn[30];
-			int dfd;
-			int ok;
-			struct supertype *st;
-			char *path;
-			struct mdinfo info;
-
-			sprintf(dn, "%d:%d", sd->disk.major, sd->disk.minor);
-			dfd = dev_open(dn, O_RDONLY);
-			if (dfd < 0)
-				continue;
-			st = guess_super(dfd);
-			if ( st == NULL)
-				ok = -1;
-			else
-				ok = st->ss->load_super(st, dfd, NULL);
-			close(dfd);
-			if (ok != 0)
-				continue;
-			st->ss->getinfo_super(st, &info);
-			if (md->devnum > 0)
-				path = map_dev(MD_MAJOR, md->devnum, 0);
-			else
-				path = map_dev(mdp, (-1-md->devnum)<< 6, 0);
-			map_add(&map, md->devnum,
-				info.text_version,
-				info.uuid, path ? : "/unknown");
-			st->ss->free_super(st);
-			break;
-		}
-	}
-	map_write(map);
-	map_free(map);
-}
-
 int IncrementalScan(int verbose)
 {
 	/* look at every device listed in the 'map' file.
@@ -710,12 +655,11 @@ int IncrementalScan(int verbose)
 	devs = conf_get_ident(NULL);
 
 	for (me = mapl ; me ; me = me->next) {
-		char path[1024];
 		mdu_array_info_t array;
 		mdu_bitmap_file_t bmf;
 		struct mdinfo *sra;
-		int mdfd = open_mddev_devnum(me->path, me->devnum,
-					     NULL, path, 0);
+		int mdfd = open_dev(me->devnum);
+
 		if (mdfd < 0)
 			continue;
 		if (ioctl(mdfd, GET_ARRAY_INFO, &array) == 0 ||
@@ -725,7 +669,8 @@ int IncrementalScan(int verbose)
 		}
 		/* Ok, we can try this one.   Maybe it needs a bitmap */
 		for (mddev = devs ; mddev ; mddev = mddev->next)
-			if (strcmp(mddev->devname, me->path) == 0)
+			if (mddev->devname && me->path
+			    && devname_matches(mddev->devname, me->path))
 				break;
 		if (mddev && mddev->bitmap_file) {
 			/*
@@ -759,11 +704,12 @@ int IncrementalScan(int verbose)
 				if (verbose >= 0)
 					fprintf(stderr, Name
 						": started array %s\n",
-						me->path);
+						me->path ?: devnum2devname(me->devnum));
 			} else {
 				fprintf(stderr, Name
 					": failed to start array %s: %s\n",
-					me->path, strerror(errno));
+					me->path ?: devnum2devname(me->devnum),
+					strerror(errno));
 				rv = 1;
 			}
 		}
@@ -771,8 +717,33 @@ int IncrementalScan(int verbose)
 	return rv;
 }
 
+static char *container2devname(char *devname)
+{
+	char *mdname = NULL;
+
+	if (devname[0] == '/') {
+		int fd = open(devname, O_RDONLY);
+		if (fd >= 0) {
+			mdname = devnum2devname(fd2devnum(fd));
+			close(fd);
+		}
+	} else {
+		int uuid[4];
+		struct map_ent *mp, *map = NULL;
+					
+		if (!parse_uuid(devname, uuid))
+			return mdname;
+		mp = map_by_uuid(&map, uuid);
+		if (mp)
+			mdname = devnum2devname(mp->devnum);
+		map_free(map);
+	}
+
+	return mdname;
+}
+
 int Incremental_container(struct supertype *st, char *devname, int verbose,
-			  int runstop, int autof)
+			  int runstop, int autof, int trustworthy)
 {
 	/* Collect the contents of this container and for each
 	 * array, choose a device name and assemble the array.
@@ -780,35 +751,27 @@ int Incremental_container(struct supertype *st, char *devname, int verbose,
 
 	struct mdinfo *list = st->ss->container_content(st);
 	struct mdinfo *ra;
+	struct map_ent *map = NULL;
+
+	map_lock(&map);
 
 	for (ra = list ; ra ; ra = ra->next) {
-		struct mdinfo *dev, *sra;
-		int devnum = -1;
 		int mdfd;
 		char chosen_name[1024];
-		int usepart = 1;
-		char *n;
-		int working = 0, preexist = 0;
-		struct map_ent *mp, *map = NULL;
-		char nbuf[64];
-		char *name_to_use;
+		struct map_ent *mp;
 		struct mddev_ident_s *match = NULL;
 
-		if ((autof&7) == 3 || (autof&7) == 5)
-			usepart = 0;
-
 		mp = map_by_uuid(&map, ra->uuid);
 
-		name_to_use = ra->name;
-		if (! name_to_use ||
-		    ! *name_to_use ||
-		    (*devname != '/' || strncmp("UUID-", strrchr(devname,'/')+1,5) == 0)
-			)
-			name_to_use = fname_from_uuid(st, ra, nbuf, '-');
-		    
-		if (!mp) {
+		if (mp) {
+			mdfd = open_dev(mp->devnum);
+			if (mp->path)
+				strcpy(chosen_name, mp->path);
+			else
+				strcpy(chosen_name, devnum2devname(mp->devnum));
+		} else {
 
-			/* Check in mdadm.conf for devices == devname and
+			/* Check in mdadm.conf for container == devname and
 			 * member == ra->text_version after second slash.
 			 */
 			char *sub = strchr(ra->text_version+1, '/');
@@ -819,7 +782,6 @@ int Incremental_container(struct supertype *st, char *devname, int verbose,
 			} else
 				array_list = NULL;
 			for(; array_list ; array_list = array_list->next) {
-				int fd;
 				char *dn;
 				if (array_list->member == NULL ||
 				    array_list->container == NULL)
@@ -829,11 +791,9 @@ int Incremental_container(struct supertype *st, char *devname, int verbose,
 				if (array_list->uuid_set &&
 				    !same_uuid(ra->uuid, array_list->uuid, st->ss->swapuuid))
 					continue;
-				fd = open(array_list->container, O_RDONLY);
-				if (fd < 0)
+				dn = container2devname(array_list->container);
+				if (dn == NULL)
 					continue;
-				dn = devnum2devname(fd2devnum(fd));
-				close(fd);
 				if (strncmp(dn, ra->text_version+1,
 					    strlen(dn)) != 0 ||
 				    ra->text_version[strlen(dn)+1] != '/') {
@@ -848,59 +808,24 @@ int Incremental_container(struct supertype *st, char *devname, int verbose,
 						array_list->member);
 				break;
 			}
-		}
-
-		if (match && is_standard(match->devname, &devnum))
-			/* we have devnum now */;
-		else if (mp)
-			devnum = mp->devnum;
-		else if (is_standard(name_to_use, &devnum))
-			/* have devnum */;
-		else {
-			n = name_to_use;
-			if (*n == 'd')
-				n++;
-			if (*n && devnum < 0) {
-				devnum = strtoul(n, &n, 10);
-				if (devnum >= 0 && (*n == 0 || *n == ' ')) {
-					/* Use this devnum */
-					usepart = (name_to_use[0] == 'd');
-					if (mddev_busy(usepart ? (-1-devnum) : devnum))
-						devnum = -1;
-				} else
-					devnum = -1;
-			}
 
-			if (devnum < 0) {
-				char *nm = name_to_use;
-				char nbuf[1024];
-				struct stat stb;
-				if (strchr(nm, ':'))
-					nm = strchr(nm, ':')+1;
-				sprintf(nbuf, "/dev/md/%s", nm);
-
-				if (stat(nbuf, &stb) == 0 &&
-				    S_ISBLK(stb.st_mode) &&
-				    major(stb.st_rdev) == (usepart ?
-							   get_mdp_major() : MD_MAJOR)){
-					if (usepart)
-						devnum = minor(stb.st_rdev)
-							>> MdpMinorShift;
-					else
-						devnum = minor(stb.st_rdev);
-					if (mddev_busy(usepart ? (-1-devnum) : devnum))
-						devnum = -1;
-				}
+			if (match && match->devname &&
+			    strcasecmp(match->devname, "<ignore>") == 0) {
+				if (verbose > 0)
+					fprintf(stderr, Name ": array %s/%s is "
+						"explicitly ignored by mdadm.conf\n",
+						match->container, match->member);
+				return 2;
 			}
-
-			if (devnum >= 0)
-				devnum = usepart ? (-1-devnum) : devnum;
-			else
-				devnum = find_free_devnum(usepart);
+			if (match)
+				trustworthy = LOCAL;
+
+			mdfd = create_mddev(match ? match->devname : NULL,
+					    ra->name,
+					    autof,
+					    trustworthy,
+					    chosen_name);
 		}
-		mdfd = open_mddev_devnum(mp ? mp->path : match ? match->devname : NULL,
-					 devnum, name_to_use,
-					 chosen_name, autof>>3);
 
 		if (mdfd < 0) {
 			fprintf(stderr, Name ": failed to open %s: %s.\n",
@@ -908,61 +833,9 @@ int Incremental_container(struct supertype *st, char *devname, int verbose,
 			return 2;
 		}
 
-
-		sysfs_init(ra, mdfd, 0);
-
-		sra = sysfs_read(mdfd, 0, GET_VERSION);
-		if (sra == NULL || strcmp(sra->text_version, ra->text_version) != 0)
-			if (sysfs_set_array(ra, md_get_version(mdfd)) != 0)
-				return 1;
-		if (sra)
-			sysfs_free(sra);
-
-		for (dev = ra->devs; dev; dev = dev->next)
-			if (sysfs_add_disk(ra, dev) == 0)
-				working++;
-			else if (errno == EEXIST)
-				preexist++;
-		if (working == 0)
-			/* Nothing new, don't try to start */ ;
-		else if (runstop > 0 ||
-			 (working + preexist) >= ra->array.working_disks) {
-			switch(ra->array.level) {
-			case LEVEL_LINEAR:
-			case LEVEL_MULTIPATH:
-			case 0:
-				sysfs_set_str(ra, NULL, "array_state",
-					      "active");
-				break;
-			default:
-				sysfs_set_str(ra, NULL, "array_state",
-					      "readonly");
-				/* start mdmon if needed. */
-				if (!mdmon_running(st->container_dev))
-					start_mdmon(st->container_dev);
-				ping_monitor(devnum2devname(st->container_dev));
-				break;
-			}
-			sysfs_set_safemode(ra, ra->safe_mode_delay);
-			if (verbose >= 0) {
-				fprintf(stderr, Name
-					": Started %s with %d devices",
-					chosen_name, working + preexist);
-				if (preexist)
-					fprintf(stderr, " (%d new)", working);
-				fprintf(stderr, "\n");
-			}
-			/* FIXME should have an O_EXCL and wait for read-auto */
-		} else
-			if (verbose >= 0)
-				fprintf(stderr, Name
-					": %s assembled with %d devices but "
-					"not started\n",
-					chosen_name, working);
-		close(mdfd);
-		map_update(&map, devnum,
-			   ra->text_version,
-			   ra->uuid, chosen_name);
+		assemble_container_content(st, mdfd, ra, runstop,
+					   chosen_name, verbose);
 	}
+	map_unlock(&map);
 	return 0;
 }