X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Incremental.c;h=009d88c1f7921d0deeaddaf6a3f062e08fdb9f92;hb=72d566f68d495261608a900b2d8cb8d037cd9178;hp=52558e4059d42aa4dd5fd7fb51925055ddaabcfe;hpb=e5508b361d970a7657c9f81303223fa114bdcd9b;p=thirdparty%2Fmdadm.git

diff --git a/Incremental.c b/Incremental.c
index 52558e40..009d88c1 100644
--- a/Incremental.c
+++ b/Incremental.c
@@ -44,16 +44,13 @@ static int try_spare(char *devname, int *dfdp, struct dev_policy *pol,
 
 static int Incremental_container(struct supertype *st, char *devname,
 				 char *homehost,
-				 int verbose, int runstop, int autof);
-
-static struct mddev_ident *search_mdstat(struct supertype *st,
-					   struct mdinfo *info,
-					   char *devname,
-					   int verbose, int *rvp);
+				 int verbose, int runstop,
+				 int readonly, int autof,
+				 int freeze_reshape);
 
 int Incremental(char *devname, int verbose, int runstop,
 		struct supertype *st, char *homehost, int require_homehost,
-		int autof)
+		int autof, int freeze_reshape)
 {
 	/* Add this device to an array, creating the array if necessary
 	 * and starting the array if sensible or - if runstop>0 - if possible.
@@ -113,20 +110,20 @@ int Incremental(char *devname, int verbose, int runstop,
 
 	if (stat(devname, &stb) < 0) {
 		if (verbose >= 0)
-			fprintf(stderr, Name ": stat failed for %s: %s.\n",
+			pr_err("stat failed for %s: %s.\n",
 				devname, strerror(errno));
 		return rv;
 	}
 	if ((stb.st_mode & S_IFMT) != S_IFBLK) {
 		if (verbose >= 0)
-			fprintf(stderr, Name ": %s is not a block device.\n",
+			pr_err("%s is not a block device.\n",
 				devname);
 		return rv;
 	}
 	dfd = dev_open(devname, O_RDONLY|O_EXCL);
 	if (dfd < 0) {
 		if (verbose >= 0)
-			fprintf(stderr, Name ": cannot open %s: %s.\n",
+			pr_err("cannot open %s: %s.\n",
 				devname, strerror(errno));
 		return rv;
 	}
@@ -138,11 +135,19 @@ int Incremental(char *devname, int verbose, int runstop,
 			rv = st->ss->load_container(st, dfd, NULL);
 
 		close(dfd);
-		if (!rv && st->ss->container_content)
-			return Incremental_container(st, devname, homehost,
-						     verbose, runstop, autof);
+		if (!rv && st->ss->container_content) {
+			if (map_lock(&map))
+				pr_err("failed to get "
+				       "exclusive lock on mapfile\n");
+			rv = Incremental_container(st, devname, homehost,
+						   verbose, runstop,
+						   0, autof,
+						   freeze_reshape);
+			map_unlock(&map);
+			return rv;
+		}
 
-		fprintf(stderr, Name ": %s is not part of an md array.\n",
+		pr_err("%s is not part of an md array.\n",
 			devname);
 		return rv;
 	}
@@ -151,9 +156,8 @@ int Incremental(char *devname, int verbose, int runstop,
 
 	if (!conf_test_dev(devname)) {
 		if (verbose >= 0)
-			fprintf(stderr, Name
-				": %s not permitted by mdadm.conf.\n",
-				devname);
+			pr_err("%s not permitted by mdadm.conf.\n",
+			       devname);
 		goto out;
 	}
 
@@ -162,13 +166,13 @@ int Incremental(char *devname, int verbose, int runstop,
 
 	if (fstat(dfd, &stb) < 0) {
 		if (verbose >= 0)
-			fprintf(stderr, Name ": fstat failed for %s: %s.\n",
+			pr_err("fstat failed for %s: %s.\n",
 				devname, strerror(errno));
 		goto out;
 	}
 	if ((stb.st_mode & S_IFMT) != S_IFBLK) {
 		if (verbose >= 0)
-			fprintf(stderr, Name ": %s is not a block device.\n",
+			pr_err("%s is not a block device.\n",
 				devname);
 		goto out;
 	}
@@ -181,9 +185,8 @@ int Incremental(char *devname, int verbose, int runstop,
 
 	if (st == NULL && (st = guess_super(dfd)) == NULL) {
 		if (verbose >= 0)
-			fprintf(stderr, Name
-				": no recognisable superblock on %s.\n",
-				devname);
+			pr_err("no recognisable superblock on %s.\n",
+			       devname);
 		rv = try_spare(devname, &dfd, policy,
 			       have_target ? &target_array : NULL,
 			       st, verbose);
@@ -192,7 +195,7 @@ int Incremental(char *devname, int verbose, int runstop,
 	if (st->ss->compare_super == NULL ||
 	    st->ss->load_super(st, dfd, NULL)) {
 		if (verbose >= 0)
-			fprintf(stderr, Name ": no RAID superblock on %s.\n",
+			pr_err("no RAID superblock on %s.\n",
 				devname);
 		rv = try_spare(devname, &dfd, policy,
 			       have_target ? &target_array : NULL,
@@ -202,18 +205,17 @@ int Incremental(char *devname, int verbose, int runstop,
 	}
 	close (dfd); dfd = -1;
 
-	memset(&info, 0, sizeof(info));
 	st->ss->getinfo_super(st, &info, NULL);
 
 	/* 3/ Check if there is a match in mdadm.conf */
-	match = search_mdstat(st, &info, devname, verbose, &rv);
+	match = conf_match(st, &info, devname, verbose, &rv);
 	if (!match && rv == 2)
 		goto out;
 
 	if (match && match->devname
 	    && strcasecmp(match->devname, "<ignore>") == 0) {
 		if (verbose >= 0)
-			fprintf(stderr, Name ": array containing %s is explicitly"
+			pr_err("array containing %s is explicitly"
 				" ignored by mdadm.conf\n",
 				devname);
 		goto out;
@@ -236,10 +238,9 @@ int Incremental(char *devname, int verbose, int runstop,
 	if (!match && !conf_test_metadata(st->ss->name, policy,
 					  (trustworthy == LOCAL))) {
 		if (verbose >= 1)
-			fprintf(stderr, Name
-				": %s has metadata type %s for which "
-				"auto-assembly is disabled\n",
-				devname, st->ss->name);
+			pr_err("%s has metadata type %s for which "
+			       "auto-assembly is disabled\n",
+			       devname, st->ss->name);
 		goto out;
 	}
 	if (trustworthy == LOCAL_ANY)
@@ -257,8 +258,7 @@ int Incremental(char *devname, int verbose, int runstop,
 
 	name_to_use = info.name;
 	if (name_to_use[0] == 0 &&
-	    info.array.level == LEVEL_CONTAINER &&
-	    trustworthy == LOCAL) {
+	    info.array.level == LEVEL_CONTAINER) {
 		name_to_use = info.text_version;
 		trustworthy = METADATA;
 	}
@@ -276,7 +276,7 @@ int Incremental(char *devname, int verbose, int runstop,
 	/* 4/ Check if array exists.
 	 */
 	if (map_lock(&map))
-		fprintf(stderr, Name ": failed to get exclusive lock on "
+		pr_err("failed to get exclusive lock on "
 			"mapfile\n");
 	mp = map_by_uuid(&map, info.uuid);
 	if (mp)
@@ -291,26 +291,26 @@ int Incremental(char *devname, int verbose, int runstop,
 				    name_to_use, autof, trustworthy, chosen_name);
 
 		if (mdfd < 0)
-			goto out;
+			goto out_unlock;
 
 		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",
+			pr_err("failed to set array info for %s: %s\n",
 				chosen_name, strerror(errno));
 			rv = 2;
-			goto out;
+			goto out_unlock;
 		}
 
 		dinfo = info;
 		dinfo.disk.major = major(stb.st_rdev);
 		dinfo.disk.minor = minor(stb.st_rdev);
 		if (add_disk(mdfd, st, &info, &dinfo) != 0) {
-			fprintf(stderr, Name ": failed to add %s to %s: %s.\n",
+			pr_err("failed to add %s to %s: %s.\n",
 				devname, chosen_name, strerror(errno));
 			ioctl(mdfd, STOP_ARRAY, 0);
 			rv = 2;
-			goto out;
+			goto out_unlock;
 		}
 		sra = sysfs_read(mdfd, -1, (GET_DEVS | GET_STATE |
 					    GET_OFFSET | GET_SIZE));
@@ -321,12 +321,10 @@ int Incremental(char *devname, int verbose, int runstop,
 			 * So reject it.
 			 */
 			ioctl(mdfd, STOP_ARRAY, NULL);
-			fprintf(stderr, Name
-		      ": You have an old buggy kernel which cannot support\n"
-				"      --incremental reliably.  Aborting.\n");
-			sysfs_free(sra);
+			pr_err("You have an old buggy kernel which cannot support\n"
+			       "      --incremental reliably.  Aborting.\n");
 			rv = 2;
-			goto out;
+			goto out_unlock;
 		}
 		info.array.working_disks = 1;
 		/* 6/ Make sure /var/run/mdadm.map contains this array. */
@@ -369,65 +367,66 @@ int Incremental(char *devname, int verbose, int runstop,
 					      act_re_add)
 		    && runstop < 1) {
 			if (ioctl(mdfd, GET_ARRAY_INFO, &ainf) == 0) {
-				fprintf(stderr, Name
-					": not adding %s to active array (without --run) %s\n",
-					devname, chosen_name);
+				pr_err("not adding %s to active array (without --run) %s\n",
+				       devname, chosen_name);
 				rv = 2;
-				goto out;
+				goto out_unlock;
 			}
 		}
 		if (!sra) {
 			rv = 2;
-			goto out;
+			goto out_unlock;
 		}
 		if (sra->devs) {
 			sprintf(dn, "%d:%d", sra->devs->disk.major,
 				sra->devs->disk.minor);
 			dfd2 = dev_open(dn, O_RDONLY);
+			if (dfd2 < 0) {
+				pr_err("unable to open %s\n", devname);
+				rv = 2;
+				goto out_unlock;
+			}
 			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);
+				pr_err("metadata mismatch between %s and "
+				       "chosen array %s\n",
+				       devname, chosen_name);
 				close(dfd2);
 				rv = 2;
-				goto out;
+				goto out_unlock;
 			}
 			close(dfd2);
-			memset(&info2, 0, sizeof(info2));
 			st2->ss->getinfo_super(st2, &info2, NULL);
 			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);
+				pr_err("unexpected difference between %s and %s.\n",
+				       chosen_name, devname);
 				rv = 2;
-				goto out;
+				goto out_unlock;
 			}
 		}
-		info2.disk.major = major(stb.st_rdev);
-		info2.disk.minor = minor(stb.st_rdev);
+		info.disk.major = major(stb.st_rdev);
+		info.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, st, sra, &info2);
+		err = add_disk(mdfd, st, sra, &info);
 		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, st, sra, &info2);
+			err = add_disk(mdfd, st, sra, &info);
 		}
 		if (err < 0) {
-			fprintf(stderr, Name ": failed to add %s to %s: %s.\n",
+			pr_err("failed to add %s to %s: %s.\n",
 				devname, chosen_name, strerror(errno));
 			rv = 2;
-			goto out;
+			goto out_unlock;
 		}
 		info.array.working_disks = 0;
 		for (d = sra->devs; d; d=d->next)
@@ -438,21 +437,25 @@ int Incremental(char *devname, int verbose, int runstop,
 	/* 7/ Is there enough devices to possibly start the array? */
 	/* 7a/ if not, finish with success. */
 	if (info.array.level == LEVEL_CONTAINER) {
-		char *devname = NULL;
+		int devnum = devnum; /* defined and used iff ->external */
 		/* Try to assemble within the container */
-		map_unlock(&map);
-		sysfs_uevent(&info, "change");
+		sysfs_uevent(sra, "change");
 		if (verbose >= 0)
-			fprintf(stderr, Name
-				": container %s now has %d devices\n",
-				chosen_name, info.array.working_disks);
+			pr_err("container %s now has %d device%s\n",
+			       chosen_name, info.array.working_disks,
+			       info.array.working_disks==1?"":"s");
 		wait_for(chosen_name, mdfd);
 		if (st->ss->external)
-			devname = devnum2devname(fd2devnum(mdfd));
+			devnum = fd2devnum(mdfd);
+		if (st->ss->load_container)
+			rv = st->ss->load_container(st, mdfd, NULL);
 		close(mdfd);
 		sysfs_free(sra);
-		rv = Incremental(chosen_name, verbose, runstop,
-				 NULL, homehost, require_homehost, autof);
+		if (!rv)
+			rv = Incremental_container(st, chosen_name, homehost,
+						   verbose, runstop, 0, autof,
+						   freeze_reshape);
+		map_unlock(&map);
 		if (rv == 1)
 			/* Don't fail the whole -I if a subarray didn't
 			 * have enough devices to start yet
@@ -460,10 +463,8 @@ int Incremental(char *devname, int verbose, int runstop,
 			rv = 0;
 		/* after spare is added, ping monitor for external metadata
 		 * so that it can eg. try to rebuild degraded array */
-		if (st->ss->external) {
-			ping_monitor(devname);
-			free(devname);
-		}
+		if (st->ss->external)
+			ping_monitor_by_id(devnum);
 		return rv;
 	}
 
@@ -477,14 +478,12 @@ int Incremental(char *devname, int verbose, int runstop,
 	active_disks = count_active(st, sra, mdfd, &avail, &info);
 	if (enough(info.array.level, info.array.raid_disks,
 		   info.array.layout, info.array.state & 1,
-		   avail, active_disks) == 0) {
+		   avail) == 0) {
 		if (verbose >= 0)
-			fprintf(stderr, Name
-			     ": %s attached to %s, not enough to start (%d).\n",
-				devname, chosen_name, active_disks);
-		map_unlock(&map);
+			pr_err("%s attached to %s, not enough to start (%d).\n",
+			       devname, chosen_name, active_disks);
 		rv = 0;
-		goto out;
+		goto out_unlock;
 	}
 
 	/* 7b/ if yes, */
@@ -495,12 +494,10 @@ int Incremental(char *devname, int verbose, int runstop,
 
 	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);
-		map_unlock(&map);
+			pr_err("%s attached to %s which is already active.\n",
+			       devname, chosen_name);
 		rv = 0;
-		goto out;
+		goto out_unlock;
 	}
 
 	map_unlock(&map);
@@ -510,16 +507,14 @@ int Incremental(char *devname, int verbose, int runstop,
 		if (match && match->bitmap_file) {
 			int bmfd = open(match->bitmap_file, O_RDWR);
 			if (bmfd < 0) {
-				fprintf(stderr, Name
-					": Could not open bitmap file %s.\n",
-					match->bitmap_file);
+				pr_err("Could not open bitmap file %s.\n",
+				       match->bitmap_file);
 				goto out;
 			}
 			if (ioctl(mdfd, SET_BITMAP_FILE, bmfd) != 0) {
 				close(bmfd);
-				fprintf(stderr, Name
-					": Failed to set bitmapfile for %s.\n",
-					chosen_name);
+				pr_err("Failed to set bitmapfile for %s.\n",
+				       chosen_name);
 				goto out;
 			}
 			close(bmfd);
@@ -539,9 +534,8 @@ int Incremental(char *devname, int verbose, int runstop,
 					   "array_state", "read-auto");
 		if (rv == 0) {
 			if (verbose >= 0)
-				fprintf(stderr, Name
-					": %s attached to %s, which has been started.\n",
-					devname, chosen_name);
+				pr_err("%s attached to %s, which has been started.\n",
+				       devname, chosen_name);
 			rv = 0;
 			wait_for(chosen_name, mdfd);
 			/* We just started the array, so some devices
@@ -553,21 +547,18 @@ int Incremental(char *devname, int verbose, int runstop,
 			for (dsk = sra->devs; dsk ; dsk = dsk->next) {
 				if (disk_action_allows(dsk, st->ss->name, act_re_add) &&
 				    add_disk(mdfd, st, sra, dsk) == 0)
-					fprintf(stderr, Name
-						": %s re-added to %s\n",
-						dsk->sys_name, chosen_name);
+					pr_err("%s re-added to %s\n",
+					       dsk->sys_name, chosen_name);
 			}
 		} else {
-			fprintf(stderr, Name
-                             ": %s attached to %s, but failed to start: %s.\n",
-				devname, chosen_name, strerror(errno));
+			pr_err("%s attached to %s, but failed to start: %s.\n",
+			       devname, chosen_name, strerror(errno));
 			rv = 1;
 		}
 	} else {
 		if (verbose >= 0)
-			fprintf(stderr, Name
-                          ": %s attached to %s, not enough to start safely.\n",
-				devname, chosen_name);
+			pr_err("%s attached to %s, not enough to start safely.\n",
+			       devname, chosen_name);
 		rv = 0;
 	}
 out:
@@ -581,79 +572,9 @@ out:
 	if (sra)
 		sysfs_free(sra);
 	return rv;
-}
-
-static struct mddev_ident *search_mdstat(struct supertype *st,
-					   struct mdinfo *info,
-					   char *devname,
-					   int verbose, int *rvp)
-{
-	struct mddev_ident *array_list, *match;
-	array_list = conf_get_ident(NULL);
-	match = NULL;
-	for (; array_list; array_list = array_list->next) {
-		if (array_list->uuid_set &&
-		    same_uuid(array_list->uuid, info->uuid, st->ss->swapuuid)
-		    == 0) {
-			if (verbose >= 2 && array_list->devname)
-				fprintf(stderr, Name
-					": UUID differs from %s.\n",
-					array_list->devname);
-			continue;
-		}
-		if (array_list->name[0] &&
-		    strcasecmp(array_list->name, info->name) != 0) {
-			if (verbose >= 2 && array_list->devname)
-				fprintf(stderr, Name
-					": Name differs from %s.\n",
-					array_list->devname);
-			continue;
-		}
-		if (array_list->devices &&
-		    !match_oneof(array_list->devices, devname)) {
-			if (verbose >= 2 && array_list->devname)
-				fprintf(stderr, Name
-					": Not a listed device for %s.\n",
-					array_list->devname);
-			continue;
-		}
-		if (array_list->super_minor != UnSet &&
-		    array_list->super_minor != info->array.md_minor) {
-			if (verbose >= 2 && array_list->devname)
-				fprintf(stderr, Name
-					": Different super-minor to %s.\n",
-					array_list->devname);
-			continue;
-		}
-		if (!array_list->uuid_set &&
-		    !array_list->name[0] &&
-		    !array_list->devices &&
-		    array_list->super_minor == UnSet) {
-			if (verbose >= 2 && array_list->devname)
-				fprintf(stderr, Name
-					": %s doesn't have any identifying information.\n",
-					array_list->devname);
-			continue;
-		}
-		/* FIXME, should I check raid_disks and level too?? */
-
-		if (match) {
-			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);
-				else
-					fprintf(stderr, Name
-						": multiple lines in mdadm.conf match\n");
-			}
-			*rvp = 2;
-			match = NULL;
-			break;
-		}
-		match = array_list;
-	}
-	return match;
+out_unlock:
+	map_unlock(&map);
+	goto out;
 }
 
 static void find_reject(int mdfd, struct supertype *st, struct mdinfo *sra,
@@ -694,9 +615,8 @@ static void find_reject(int mdfd, struct supertype *st, struct mdinfo *sra,
 			sysfs_set_str(sra, d, "slot", "none");
 		if (sysfs_set_str(sra, d, "state", "remove") == 0)
 			if (verbose >= 0)
-				fprintf(stderr, Name
-					": removing old device %s from %s\n",
-					d->sys_name+4, array_name);
+				pr_err("removing old device %s from %s\n",
+				       d->sys_name+4, array_name);
 	}
 }
 
@@ -709,7 +629,7 @@ static int count_active(struct supertype *st, struct mdinfo *sra,
 	int cnt = 0;
 	__u64 max_events = 0;
 	char *avail = NULL;
-	int *best;
+	int *best = NULL;
 	char *devmap = NULL;
 	int numdevs = 0;
 	int devnum;
@@ -739,15 +659,11 @@ static int count_active(struct supertype *st, struct mdinfo *sra,
 		st->ss->getinfo_super(st, &info, devmap + raid_disks * devnum);
 		if (!avail) {
 			raid_disks = info.array.raid_disks;
-			avail = calloc(raid_disks, 1);
-			if (!avail) {
-				fprintf(stderr, Name ": out of memory.\n");
-				exit(1);
-			}
+			avail = xcalloc(raid_disks, 1);
 			*availp = avail;
 
-			best = calloc(raid_disks, sizeof(int));
-			devmap = calloc(raid_disks * numdevs, 1);
+			best = xcalloc(raid_disks, sizeof(int));
+			devmap = xcalloc(raid_disks, numdevs);
 
 			st->ss->getinfo_super(st, &info, devmap);
 		}
@@ -780,9 +696,10 @@ static int count_active(struct supertype *st, struct mdinfo *sra,
 				best[info.disk.raid_disk] = devnum;
 				st->ss->getinfo_super(st, bestinfo, NULL);
 			} else { /* info.events much bigger */
-				memset(avail, 0, info.disk.raid_disk);
+				memset(avail, 0, raid_disks);
 				max_events = info.events;
 				avail[info.disk.raid_disk] = 2;
+				best[info.disk.raid_disk] = devnum;
 				st->ss->getinfo_super(st, bestinfo, NULL);
 			}
 		}
@@ -874,7 +791,7 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol,
 	 */
 
 	if (map_lock(&map)) {
-		fprintf(stderr, Name ": failed to get exclusive lock on "
+		pr_err("failed to get exclusive lock on "
 			"mapfile\n");
 		return 1;
 	}
@@ -883,7 +800,7 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol,
 		struct domainlist *dl = NULL;
 		struct mdinfo *sra;
 		unsigned long long devsize;
-		unsigned long long component_size;
+		unsigned long long component_size = 0;
 
 		if (is_subarray(mp->metadata))
 			continue;
@@ -893,7 +810,7 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol,
 			    (st->minor_version >= 0 &&
 			     st->minor_version != st2->minor_version)) {
 				if (verbose > 1)
-					fprintf(stderr, Name ": not adding %s to %s as metadata type doesn't match\n",
+					pr_err("not adding %s to %s as metadata type doesn't match\n",
 						devname, mp->path);
 				free(st2);
 				continue;
@@ -921,7 +838,7 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol,
 					sra->text_version);
 			if (!st2) {
 				if (verbose > 1)
-					fprintf(stderr, Name ": not adding %s to %s"
+					pr_err("not adding %s to %s"
 						" as metadata not recognised.\n",
 						devname, mp->path);
 				goto next;
@@ -947,8 +864,10 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol,
 			 * to obtain minimum spare size */
 			struct supertype *st3 = dup_super(st2);
 			int mdfd = open_dev(mp->devnum);
-			if (!mdfd)
+			if (mdfd < 0) {
+				free(st3);
 				goto next;
+			}
 			if (st3->ss->load_container &&
 			    !st3->ss->load_container(st3, mdfd, mp->path)) {
 				component_size = st3->ss->min_acceptable_spare_size(st3);
@@ -962,7 +881,7 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol,
 		    ||
 		    (sra->component_size == 0 && devsize < component_size)) {
 			if (verbose > 1)
-				fprintf(stderr, Name ": not adding %s to %s as it is too small\n",
+				pr_err("not adding %s to %s as it is too small\n",
 					devname, mp->path);
 			goto next;
 		}
@@ -998,7 +917,7 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol,
 		if (domain_test(dl, pol, st2->ss->name) != 1) {
 			/* domain test fails */
 			if (verbose > 1)
-				fprintf(stderr, Name ": not adding %s to %s as"
+				pr_err("not adding %s to %s as"
 					" it is not in a compatible domain\n",
 					devname, mp->path);
 
@@ -1029,7 +948,6 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol,
 			char devname[20];
 			devlist.next = NULL;
 			devlist.used = 0;
-			devlist.re_add = 0;
 			devlist.writemostly = 0;
 			devlist.devname = devname;
 			sprintf(devname, "%d:%d", major(stb.st_rdev),
@@ -1038,19 +956,20 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol,
 			close(dfd);
 			*dfdp = -1;
 			rv =  Manage_subdevs(chosen->sys_name, mdfd, &devlist,
-					     -1, 0, NULL);
+					     -1, 0, NULL, 0);
 			close(mdfd);
 		}
 		if (verbose > 0) {
 			if (rv == 0)
-				fprintf(stderr, Name ": added %s as spare for %s\n",
+				pr_err("added %s as spare for %s\n",
 					devname, chosen->sys_name);
 			else
-				fprintf(stderr, Name ": failed to add %s as spare for %s\n",
+				pr_err("failed to add %s as spare for %s\n",
 					devname, chosen->sys_name);
 		}
 		sysfs_free(chosen);
 	}
+	map_unlock(&map);
 	return rv;
 }
 
@@ -1077,7 +996,7 @@ static int partition_try_spare(char *devname, int *dfdp, struct dev_policy *pol,
 	DIR *dir;
 	struct dirent *de;
 	char *chosen = NULL;
-	unsigned long long chosen_size;
+	unsigned long long chosen_size = 0;
 	struct supertype *chosen_st = NULL;
 	int fd;
 
@@ -1118,7 +1037,10 @@ static int partition_try_spare(char *devname, int *dfdp, struct dev_policy *pol,
 		domain_free(domlist);
 		domlist = NULL;
 
-		asprintf(&devname, "/dev/disk/by-path/%s", de->d_name);
+		if (asprintf(&devname, "/dev/disk/by-path/%s", de->d_name) != 1) {
+			devname = NULL;
+			goto next;
+		}
 		fd = open(devname, O_RDONLY);
 		if (fd < 0)
 			goto next;
@@ -1184,6 +1106,8 @@ static int partition_try_spare(char *devname, int *dfdp, struct dev_policy *pol,
 			close(fd);
 	}
 
+	closedir(dir);
+
 	if (!chosen)
 		return 1;
 
@@ -1266,7 +1190,7 @@ static int try_spare(char *devname, int *dfdp, struct dev_policy *pol,
 		    !policy_action_allows(pol, st?st->ss->name:NULL,
 					  act_spare_same_slot)) {
 			if (verbose > 1)
-				fprintf(stderr, Name ": %s is not bare, so not "
+				pr_err("%s is not bare, so not "
 					"considering as a spare\n",
 					devname);
 			return 1;
@@ -1360,13 +1284,11 @@ int IncrementalScan(int verbose)
 			}
 			if (verbose >= 0) {
 				if (added == 0)
-					fprintf(stderr, Name
-						": Added bitmap %s to %s\n",
-						mddev->bitmap_file, me->path);
+					pr_err("Added bitmap %s to %s\n",
+					       mddev->bitmap_file, me->path);
 				else if (errno != EEXIST)
-					fprintf(stderr, Name
-					   ": Failed to add bitmap to %s: %s\n",
-						me->path, strerror(errno));
+					pr_err("Failed to add bitmap to %s: %s\n",
+					       me->path, strerror(errno));
 			}
 		}
 		sra = sysfs_read(mdfd, 0, 0);
@@ -1374,16 +1296,15 @@ int IncrementalScan(int verbose)
 			if (sysfs_set_str(sra, NULL,
 					  "array_state", "read-auto") == 0) {
 				if (verbose >= 0)
-					fprintf(stderr, Name
-						": started array %s\n",
-						me->path ?: devnum2devname(me->devnum));
+					pr_err("started array %s\n",
+					       me->path ?: devnum2devname(me->devnum));
 			} else {
-				fprintf(stderr, Name
-					": failed to start array %s: %s\n",
-					me->path ?: devnum2devname(me->devnum),
-					strerror(errno));
+				pr_err("failed to start array %s: %s\n",
+				       me->path ?: devnum2devname(me->devnum),
+				       strerror(errno));
 				rv = 1;
 			}
+			sysfs_free(sra);
 		}
 	}
 	return rv;
@@ -1416,7 +1337,8 @@ static char *container2devname(char *devname)
 
 static int Incremental_container(struct supertype *st, char *devname,
 				 char *homehost, int verbose,
-				 int runstop, int autof)
+				 int runstop, int readonly,
+				 int autof, int freeze_reshape)
 {
 	/* Collect the contents of this container and for each
 	 * array, choose a device name and assemble the array.
@@ -1433,8 +1355,9 @@ static int Incremental_container(struct supertype *st, char *devname,
 	struct map_ent *smp;
 	int suuid[4];
 	int sfd;
+	int ra_blocked = 0;
+	int ra_all = 0;
 
-	memset(&info, 0, sizeof(info));
 	st->ss->getinfo_super(st, &info, NULL);
 
 	if ((runstop > 0 && info.container_enough >= 0) ||
@@ -1442,11 +1365,11 @@ static int Incremental_container(struct supertype *st, char *devname,
 		/* pass */;
 	else {
 		if (verbose)
-			fprintf(stderr, Name ": not enough devices to start the container\n");
+			pr_err("not enough devices to start the container\n");
 		return 0;
 	}
 
-	match = search_mdstat(st, &info, devname, verbose, &rv);
+	match = conf_match(st, &info, devname, verbose, &rv);
 	if (match == NULL && rv == 2)
 		return rv;
 
@@ -1461,22 +1384,23 @@ static int Incremental_container(struct supertype *st, char *devname,
 		trustworthy = FOREIGN;
 
 	list = st->ss->container_content(st, NULL);
-	if (map_lock(&map))
-		fprintf(stderr, Name ": failed to get exclusive lock on "
-			"mapfile\n");
-	/* do not assemble arrays that might have bad blocks */
-	if (list->array.state & (1<<MD_SB_BBM_ERRORS)) {
-		fprintf(stderr, Name ": BBM log found in metadata. "
-					"Cannot activate array(s).\n");
-		list = NULL;
-	}
-
+	/* when nothing to activate - quit */
+	if (list == NULL)
+		return 0;
 	for (ra = list ; ra ; ra = ra->next) {
 		int mdfd;
 		char chosen_name[1024];
 		struct map_ent *mp;
 		struct mddev_ident *match = NULL;
 
+		ra_all++;
+		/* do not activate arrays blocked by metadata handler */
+		if (ra->array.state & (1 << MD_SB_BLOCK_VOLUME)) {
+			pr_err("Cannot activate array %s in %s.\n",
+				ra->text_version, devname);
+			ra_blocked++;
+			continue;
+		}
 		mp = map_by_uuid(&map, ra->uuid);
 
 		if (mp) {
@@ -1520,7 +1444,7 @@ static int Incremental_container(struct supertype *st, char *devname,
 				/* we have a match */
 				match = array_list;
 				if (verbose>0)
-					fprintf(stderr, Name ": match found for member %s\n",
+					pr_err("match found for member %s\n",
 						array_list->member);
 				break;
 			}
@@ -1528,9 +1452,9 @@ static int Incremental_container(struct supertype *st, char *devname,
 			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);
+					pr_err("array %s/%s is "
+					       "explicitly ignored by mdadm.conf\n",
+					       match->container, match->member);
 				return 2;
 			}
 			if (match)
@@ -1544,15 +1468,22 @@ static int Incremental_container(struct supertype *st, char *devname,
 		}
 
 		if (mdfd < 0) {
-			fprintf(stderr, Name ": failed to open %s: %s.\n",
+			pr_err("failed to open %s: %s.\n",
 				chosen_name, strerror(errno));
 			return 2;
 		}
 
-		assemble_container_content(st, mdfd, ra, runstop,
-					   chosen_name, verbose);
+		assemble_container_content(st, mdfd, ra, runstop, readonly,
+					   chosen_name, verbose, NULL,
+					   freeze_reshape);
+		close(mdfd);
 	}
 
+	/* don't move spares to container with volume being activated
+	   when all volumes are blocked */
+	if (ra_all == ra_blocked)
+		return 0;
+
 	/* Now move all suitable spares from spare container */
 	domains = domain_from_array(list, st->ss->name);
 	memcpy(suuid, uuid_zero, sizeof(int[4]));
@@ -1589,16 +1520,14 @@ static int Incremental_container(struct supertype *st, char *devname,
 					disks = disks->next;
 				}
 				if (count)
-					fprintf(stderr, Name
-						": Added %d spare%s to %s\n",
-						count, count>1?"s":"", devname);
+					pr_err("Added %d spare%s to %s\n",
+					       count, count>1?"s":"", devname);
 			}
 			sysfs_free(sinfo);
 		} else
 			close(sfd);
 	}
 	domain_free(domains);
-	map_unlock(&map);
 	return 0;
 }
 
@@ -1625,19 +1554,19 @@ int IncrementalRemove(char *devname, char *id_path, int verbose)
 			"port\n");
 
 	if (strchr(devname, '/')) {
-		fprintf(stderr, Name ": incremental removal requires a "
+		pr_err("incremental removal requires a "
 			"kernel device name, not a file: %s\n", devname);
 		return 1;
 	}
 	ent = mdstat_by_component(devname);
 	if (!ent) {
-		fprintf(stderr, Name ": %s does not appear to be a component "
+		pr_err("%s does not appear to be a component "
 			"of any array\n", devname);
 		return 1;
 	}
 	mdfd = open_dev(ent->devnum);
 	if (mdfd < 0) {
-		fprintf(stderr, Name ": Cannot open array %s!!\n", ent->dev);
+		pr_err("Cannot open array %s!!\n", ent->dev);
 		free_mdstat(ent);
 		return 1;
 	}
@@ -1664,15 +1593,15 @@ int IncrementalRemove(char *devname, char *id_path, int verbose)
 				if (subfd >= 0) {
 					Manage_subdevs(memb->dev, subfd,
 						       &devlist, verbose, 0,
-						       NULL);
+						       NULL, 0);
 					close(subfd);
 				}
 			}
 		free_mdstat(mdstat);
 	} else
-		Manage_subdevs(ent->dev, mdfd, &devlist, verbose, 0, NULL);
+		Manage_subdevs(ent->dev, mdfd, &devlist, verbose, 0, NULL, 0);
 	devlist.disposition = 'r';
-	rv = Manage_subdevs(ent->dev, mdfd, &devlist, verbose, 0, NULL);
+	rv = Manage_subdevs(ent->dev, mdfd, &devlist, verbose, 0, NULL, 0);
 	close(mdfd);
 	free_mdstat(ent);
 	return rv;