X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Create.c;h=629d359c26a85ce8c3bcea8d82dda9ab280f4fa9;hb=11fcec12ef68fa3b915e26676c47ee0f97d62256;hp=ac776c289f303ce49b76b1dbcf76c9539cdc1dd2;hpb=682c705194a869b882cd710d5f996142912db390;p=thirdparty%2Fmdadm.git

diff --git a/Create.c b/Create.c
index ac776c28..629d359c 100644
--- a/Create.c
+++ b/Create.c
@@ -1,7 +1,7 @@
 /*
- * mdctl - manage Linux "md" devices aka RAID arrays.
+ * mdadm - manage Linux "md" devices aka RAID arrays.
  *
- * Copyright (C) 2001 Neil Brown <neilb@cse.unsw.edu.au>
+ * Copyright (C) 2001-2006 Neil Brown <neilb@suse.de>
  *
  *
  *    This program is free software; you can redistribute it and/or modify
@@ -27,14 +27,17 @@
  *           Australia
  */
 
-#include "mdctl.h"
+#include "mdadm.h"
 #include	"md_u.h"
 #include	"md_p.h"
+#include	<ctype.h>
 
-int Create(char *mddev, int mdfd,
-	   int chunk, int level, int layout, int size, int raiddisks, int sparedisks,
-	   int subdevs, char *subdev[],
-	   int runstop, int verbose)
+int Create(struct supertype *st, char *mddev, int mdfd,
+	   int chunk, int level, int layout, unsigned long long size, int raiddisks, int sparedisks,
+	   char *name, char *homehost, int *uuid,
+	   int subdevs, mddev_dev_t devlist,
+	   int runstop, int verbose, int force, int assume_clean,
+	   char *bitmap_file, int bitmap_chunk, int write_behind, int delay)
 {
 	/*
 	 * Create a new raid array.
@@ -49,196 +52,559 @@ int Create(char *mddev, int mdfd,
 	 * abort.
 	 *
 	 * SET_ARRAY_INFO and ADD_NEW_DISK, and
-	 * if runstop==run, or raiddisks diskswere used,
+	 * if runstop==run, or raiddisks disks were used,
 	 * RUN_ARRAY
 	 */
-	int minsize, maxsize;
-	int maxdisc= -1, mindisc = -1;
-	int i;
+	unsigned long long minsize=0, maxsize=0;
+	char *mindisc = NULL;
+	char *maxdisc = NULL;
+	int dnum;
+	mddev_dev_t dv;
 	int fail=0, warn=0;
+	struct stat stb;
+	int first_missing = subdevs * 2;
+	int second_missing = subdevs * 2;
+	int missing_disks = 0;
+	int insert_point = subdevs * 2; /* where to insert a missing drive */
+	int pass;
+	int vers;
+	int rv;
+	int bitmap_fd;
+	unsigned long long bitmapsize;
+	struct mdinfo info;
 
-	mdu_array_info_t array;
-	mdu_param_t param;
-	
+	int major_num = BITMAP_MAJOR_HI;
 
-	if (md_get_version(mdfd) < 9000) {
-	    fprintf(stderr, Name ": Create requires md driver verison 0.90.0 or later\n");
-	    return 1;
+	memset(&info, 0, sizeof(info));
+
+	vers = md_get_version(mdfd);
+	if (vers < 9000) {
+		fprintf(stderr, Name ": Create requires md driver version 0.90.0 or later\n");
+		return 1;
+	} else {
+		mdu_array_info_t inf;
+		memset(&inf, 0, sizeof(inf));
+		ioctl(mdfd, GET_ARRAY_INFO, &inf);
+		if (inf.working_disks != 0) {
+			fprintf(stderr, Name ": another array by this name"
+				" is already running.\n");
+			return 1;
+		}
 	}
-	if (level == -10) {
+	if (level == UnSet) {
 		fprintf(stderr,
 			Name ": a RAID level is needed to create an array.\n");
 		return 1;
 	}
-	if (raiddisks < 1) {
+	if (raiddisks < 4 && level == 6) {
 		fprintf(stderr,
-			Name ": a number of --raid-disks must be given to create an array\n");
+			Name ": at least 4 raid-devices needed for level 6\n");
 		return 1;
 	}
-	if (raiddisks+sparedisks > MD_SB_DISKS) {
+	if (raiddisks > 256 && level == 6) {
 		fprintf(stderr,
-			Name ": too many discs requested: %d+%d > %d\n",
-			raiddisks, sparedisks, MD_SB_DISKS);
+			Name ": no more than 256 raid-devices supported for level 6\n");
+		return 1;
+	}
+	if (raiddisks < 2 && level >= 4) {
+		fprintf(stderr,
+			Name ": at least 2 raid-devices needed for level 4 or 5\n");
+		return 1;
+	}
+	if (level <= 0 && sparedisks) {
+		fprintf(stderr,
+			Name ": This level does not support spare devices\n");
 		return 1;
 	}
 	if (subdevs > raiddisks+sparedisks) {
-	    fprintf(stderr, Name ": You have listed more disks (%d) than are in the array(%d)!\n", subdevs, raiddisks+sparedisks);
-	    return 1;
+		fprintf(stderr, Name ": You have listed more devices (%d) than are in the array(%d)!\n", subdevs, raiddisks+sparedisks);
+		return 1;
 	}
+	if (subdevs < raiddisks+sparedisks) {
+		fprintf(stderr, Name ": You haven't given enough devices (real or missing) to create this array\n");
+		return 1;
+	}
+	if (bitmap_file && level <= 0) {
+		fprintf(stderr, Name ": bitmaps not meaningful with level %s\n",
+			map_num(pers, level)?:"given");
+		return 1;
+	}
+
 	/* now set some defaults */
-	if (layout == -1)
+	if (layout == UnSet)
 		switch(level) {
 		default: /* no layout */
 			layout = 0;
 			break;
+		case 10:
+			layout = 0x102; /* near=2, far=1 */
+			if (verbose > 0)
+				fprintf(stderr,
+					Name ": layout defaults to n1\n");
+			break;
 		case 5:
+		case 6:
 			layout = map_name(r5layout, "default");
-			if (verbose)
+			if (verbose > 0)
 				fprintf(stderr,
 					Name ": layout defaults to %s\n", map_num(r5layout, layout));
 			break;
+		case LEVEL_FAULTY:
+			layout = map_name(faultylayout, "default");
+
+			if (verbose > 0)
+				fprintf(stderr,
+					Name ": layout defaults to %s\n", map_num(faultylayout, layout));
+			break;
+		}
+
+	if (level == 10)
+		/* check layout fits in array*/
+		if ((layout&255) * ((layout>>8)&255) > raiddisks) {
+			fprintf(stderr, Name ": that layout requires at least %d devices\n",
+				(layout&255) * ((layout>>8)&255));
+			return 1;
 		}
 
-	if (chunk == 0) {
-		chunk = 64;
-		if (verbose)
-			fprintf(stderr, Name ": chunk size defaults to 64K\n");
+	switch(level) {
+	case 4:
+	case 5:
+	case 10:
+	case 6:
+	case 0:
+	case LEVEL_LINEAR: /* linear */
+		if (chunk == 0) {
+			chunk = 64;
+			if (verbose > 0)
+				fprintf(stderr, Name ": chunk size defaults to 64K\n");
+		}
+		break;
+	case 1:
+	case LEVEL_FAULTY:
+	case LEVEL_MULTIPATH:
+	case LEVEL_CONTAINER:
+		if (chunk) {
+			chunk = 0;
+			if (verbose > 0)
+				fprintf(stderr, Name ": chunk size ignored for this level\n");
+		}
+		break;
+	default:
+		fprintf(stderr, Name ": unknown level %d\n", level);
+		return 1;
 	}
 
+	if (st && ! st->ss->validate_geometry(st, level, layout, raiddisks,
+					      chunk, size, NULL, NULL))
+		return 1;
+
 	/* now look at the subdevs */
-	for (i=0; i<subdevs; i++) {
-		char *dname = subdev[i];
-		int dsize, freesize;
-		int fd = open(dname, O_RDONLY, 0);
-		if (fd <0 ) {
-			fprintf(stderr, Name ": Cannot open %s: %s\n",
-				dname, strerror(errno));
-			fail=1;
+	info.array.active_disks = 0;
+	info.array.working_disks = 0;
+	dnum = 0;
+	for (dv=devlist; dv; dv=dv->next, dnum++) {
+		char *dname = dv->devname;
+		unsigned long long freesize;
+		if (strcasecmp(dname, "missing")==0) {
+			if (first_missing > dnum)
+				first_missing = dnum;
+			if (second_missing > dnum && dnum > first_missing)
+				second_missing = dnum;
+			missing_disks ++;
 			continue;
 		}
-		if (ioctl(fd, BLKGETSIZE, &dsize)) {
-			fprintf(stderr, Name ": Cannot get size of %s: %s\n",
-				dname, strerror(errno));
-			fail = 1;
-			close(fd);
-			continue;
+		info.array.working_disks++;
+		if (dnum < raiddisks)
+			info.array.active_disks++;
+		if (st == NULL) {
+			struct createinfo *ci = conf_get_create_info();
+			if (ci)
+				st = ci->supertype;
+		}
+		if (st == NULL) {
+			/* Need to choose a default metadata, which is different
+			 * depending on geometry of array.
+			 */
+			int i;
+			char *name = "default";
+			for(i=0; !st && superlist[i]; i++) {
+				st = superlist[i]->match_metadata_desc(name);
+				if (st && !st->ss->validate_geometry
+					    	(st, level, layout, raiddisks,
+						 chunk, size, dname, &freesize))
+					st = NULL;
+			}
+
+			if (!st) {
+				fprintf(stderr, Name ": device %s not suitable "
+					"for any style of array\n",
+					dname);
+				exit(2);
+			}
+			if (st->ss->major != 0 ||
+			    st->minor_version != 90)
+				fprintf(stderr, Name ": Defaulting to version"
+					" %d.%d metadata\n",
+					st->ss->major,
+					st->minor_version);
+		} else {
+			if (!st->ss->validate_geometry(st, level, layout,
+						       raiddisks,
+						       chunk, size, dname,
+						       &freesize)) {
+
+				fprintf(stderr,
+					Name ": %s is not suitable for "
+					"this array.\n",
+					dname);
+				fail = 1;
+				continue;
+			}
 		}
-		if (dsize < MD_RESERVED_SECTORS*2) {
-		    fprintf(stderr, Name ": %s is too small: %dK\n",
-			    dname, dsize/2);
-		    fail = 1;
-		    close(fd);
-		    continue;
+
+		freesize /= 2; /* convert to K */
+		if (chunk) {
+			/* round to chunk size */
+			freesize = freesize & ~(chunk-1);
 		}
-		freesize = MD_NEW_SIZE_SECTORS(dsize);
-		freesize /= 2;
 
 		if (size && freesize < size) {
-		    fprintf(stderr, Name ": %s is smaller that given size."
-			    " %dK < %dK + superblock\n", dname, freesize, size);
-		    fail = 1;
-		    close(fd);
-		    continue;
+			fprintf(stderr, Name ": %s is smaller that given size."
+				" %lluK < %lluK + metadata\n",
+				dname, freesize, size);
+			fail = 1;
+			continue;
+		}
+		if (maxdisc == NULL || (maxdisc && freesize > maxsize)) {
+			maxdisc = dname;
+			maxsize = freesize;
 		}
-		if (maxdisc< 0 || (maxdisc>=0 && freesize > maxsize)) {
-		    maxdisc = i;
-		    maxsize = freesize;
+		if (mindisc ==NULL || (mindisc && freesize < minsize)) {
+			mindisc = dname;
+			minsize = freesize;
 		}
-		if (mindisc < 0 || (mindisc >=0 && freesize < minsize)) {
-		    mindisc = i;
-		    minsize = freesize;
+		if (runstop != 1 || verbose >= 0) {
+			int fd = open(dname, O_RDONLY, 0);
+			if (fd <0 ) {
+				fprintf(stderr, Name ": Cannot open %s: %s\n",
+					dname, strerror(errno));
+				fail=1;
+				continue;
+			}
+			warn |= check_ext2(fd, dname);
+			warn |= check_reiser(fd, dname);
+			warn |= check_raid(fd, dname);
+			close(fd);
 		}
-		warn |= check_ext2(fd, dname);
-		warn |= check_reiser(fd, dname);
-		warn |= check_raid(fd, dname);
-		close(fd);
 	}
 	if (fail) {
-	    fprintf(stderr, Name ": create aborted\n");
-	    return 1;
+		fprintf(stderr, Name ": create aborted\n");
+		return 1;
 	}
 	if (size == 0) {
-	    if (mindisc == -1) {
-		fprintf(stderr, Name ": no size and no drives given - aborting create.\n");
-		return 1;
-	    }
-	    size = minsize;
-	    if (verbose)
-		fprintf(stderr, Name ": size set to %dK\n", size);
+		if (mindisc == NULL) {
+			fprintf(stderr, Name ": no size and no drives given - aborting create.\n");
+			return 1;
+		}
+		if (level > 0 || level == LEVEL_MULTIPATH || level == LEVEL_FAULTY) {
+			/* size is meaningful */
+			if (minsize > 0x100000000ULL && st->ss->major == 0) {
+				fprintf(stderr, Name ": devices too large for RAID level %d\n", level);
+				return 1;
+			}
+			size = minsize;
+			if (verbose > 0)
+				fprintf(stderr, Name ": size set to %lluK\n", size);
+		}
 	}
-	if ((maxsize-size)*100 > maxsize) {
-	    fprintf(stderr, Name ": largest drive (%s) exceed size (%dK) by more than 1%\n",
-		    subdev[maxdisc], size);
-	    warn = 1;
+	if (level > 0 && ((maxsize-size)*100 > maxsize)) {
+		if (runstop != 1 || verbose >= 0)
+			fprintf(stderr, Name ": largest drive (%s) exceed size (%lluK) by more than 1%%\n",
+				maxdisc, size);
+		warn = 1;
 	}
 
 	if (warn) {
-	    if (runstop!= 1) {
-		if (!ask("Continue creating array? ")) {
-		    fprintf(stderr, Name ": create aborted.\n");
-		    return 1;
+		if (runstop!= 1) {
+			if (!ask("Continue creating array? ")) {
+				fprintf(stderr, Name ": create aborted.\n");
+				return 1;
+			}
+		} else {
+			if (verbose > 0)
+				fprintf(stderr, Name ": creation continuing despite oddities due to --run\n");
 		}
-	    } else {
-		if (verbose)
-		    fprintf(stderr, Name ": creation continuing despite oddities due to --run\n");
-	    }
+	}
+
+	/* If this is raid4/5, we want to configure the last active slot
+	 * as missing, so that a reconstruct happens (faster than re-parity)
+	 * FIX: Can we do this for raid6 as well?
+	 */
+	if (assume_clean==0 && force == 0 && first_missing >= raiddisks) {
+		switch ( level ) {
+		case 4:
+		case 5:
+			insert_point = raiddisks-1;
+			sparedisks++;
+			info.array.active_disks--;
+			missing_disks++;
+			break;
+		default:
+			break;
+		}
+	}
+	/* For raid6, if creating with 1 missing drive, make a good drive
+	 * into a spare, else the create will fail
+	 */
+	if (assume_clean == 0 && force == 0 && first_missing < raiddisks &&
+	    second_missing >= raiddisks && level == 6) {
+		insert_point = raiddisks - 1;
+		if (insert_point == first_missing)
+			insert_point--;
+		sparedisks ++;
+		info.array.active_disks--;
+		missing_disks++;
+	}
+
+	if (level <= 0 && first_missing != subdevs * 2) {
+		fprintf(stderr,
+			Name ": This level does not support missing devices\n");
+		return 1;
 	}
 
 	/* Ok, lets try some ioctls */
 
-	array.level = level;
-	array.size = size;
-	array.nr_disks = raiddisks+sparedisks;
-	array.raid_disks = raiddisks;
-	array.md_minor = 0;
-	array.not_persistent = 0;
-	array.state = 0; /* not clean, but no errors */
-	array.active_disks=0;
-	array.working_disks=0;
-	array.spare_disks=0;
-	array.failed_disks=0;
-	array.layout = layout;
-	array.chunk_size = chunk*1024;
-
-	if (ioctl(mdfd, SET_ARRAY_INFO, &array)) {
-	    fprintf(stderr, Name ": SET_ARRAY_INFO failed for %s: %s\n",
-		    mddev, strerror(errno));
-	    return 1;
-	}
-	
-	for (i=0; i<subdevs; i++) {
-	    int fd = open(subdev[i], O_RDONLY, 0);
-	    struct stat stb;
-	    mdu_disk_info_t disk;
-	    if (fd < 0) {
-		fprintf(stderr, Name ": failed to open %s after earlier success - aborting\n",
-			subdev[i]);
+	info.array.level = level;
+	info.array.size = size;
+	info.array.raid_disks = raiddisks;
+	/* The kernel should *know* what md_minor we are dealing
+	 * with, but it chooses to trust me instead. Sigh
+	 */
+	info.array.md_minor = 0;
+	if (fstat(mdfd, &stb)==0)
+		info.array.md_minor = minor(stb.st_rdev);
+	info.array.not_persistent = 0;
+
+	if ( ( (level == 4 || level == 5) &&
+	       (insert_point < raiddisks || first_missing < raiddisks) )
+	     ||
+	     ( level == 6 && (insert_point < raiddisks
+			      || second_missing < raiddisks))
+	     ||
+	     assume_clean
+		)
+		info.array.state = 1; /* clean, but one+ drive will be missing*/
+	else
+		info.array.state = 0; /* not clean, but no errors */
+
+	if (level == 10) {
+		/* for raid10, the bitmap size is the capacity of the array,
+		 * which is array.size * raid_disks / ncopies;
+		 * .. but convert to sectors.
+		 */
+		int ncopies = ((layout>>8) & 255) * (layout & 255);
+		bitmapsize = (unsigned long long)size * raiddisks / ncopies * 2;
+/*		printf("bms=%llu as=%d rd=%d nc=%d\n", bitmapsize, size, raiddisks, ncopies);*/
+	} else
+		bitmapsize = (unsigned long long)size * 2;
+
+	/* There is lots of redundancy in these disk counts,
+	 * raid_disks is the most meaningful value
+	 *          it describes the geometry of the array
+	 *          it is constant
+	 * nr_disks is total number of used slots.
+	 *          it should be raid_disks+spare_disks
+	 * spare_disks is the number of extra disks present
+	 *          see above
+	 * active_disks is the number of working disks in
+	 *          active slots. (With raid_disks)
+	 * working_disks is the total number of working disks,
+	 *          including spares
+	 * failed_disks is the number of disks marked failed
+	 *
+         * Ideally, the kernel would keep these (except raid_disks)
+	 * up-to-date as we ADD_NEW_DISK, but it doesn't (yet).
+	 * So for now, we assume that all raid and spare
+	 * devices will be given.
+	 */
+	info.array.spare_disks=sparedisks;
+	info.array.failed_disks=missing_disks;
+	info.array.nr_disks = info.array.working_disks
+		+ info.array.failed_disks;
+	info.array.layout = layout;
+	info.array.chunk_size = chunk*1024;
+	info.array.major_version = st->ss->major;
+
+	if (name == NULL || *name == 0) {
+		/* base name on mddev */
+		/*  /dev/md0 -> 0
+		 *  /dev/md_d0 -> d0
+		 *  /dev/md/1 -> 1
+		 *  /dev/md/d1 -> d1
+		 *  /dev/md/home -> home
+		 *  /dev/mdhome -> home
+		 */
+		name = strrchr(mddev, '/');
+		if (name) {
+			name++;
+			if (strncmp(name, "md_d", 4)==0 &&
+			    strlen(name) > 4 &&
+			    isdigit(name[4]) &&
+			    (name-mddev) == 5 /* /dev/ */)
+				name += 3;
+			else if (strncmp(name, "md", 2)==0 &&
+				 strlen(name) > 2 &&
+				 isdigit(name[2]) &&
+				 (name-mddev) == 5 /* /dev/ */)
+				name += 2;
+		}
+	}
+	if (!st->ss->init_super(st, &info.array, size, name, homehost, uuid))
 		return 1;
-	    }
-	    fstat(fd, &stb);
-	    disk.number = i;
-	    disk.raid_disk = i;
-	    disk.state = 6; /* active and in sync */
-	    disk.major = MAJOR(stb.st_rdev);
-	    disk.minor = MINOR(stb.st_rdev);
-	    close(fd);
-	    if (ioctl(mdfd, ADD_NEW_DISK, &disk)) {
-		fprintf(stderr, Name ": ADD_NEW_DISK for %s failed: %s\b",
-			subdev[i], strerror(errno));
+
+	if (bitmap_file && vers < 9003) {
+		major_num = BITMAP_MAJOR_HOSTENDIAN;
+#ifdef __BIG_ENDIAN
+		fprintf(stderr, Name ": Warning - bitmaps created on this kernel are not portable\n"
+			"  between different architectured.  Consider upgrading the Linux kernel.\n");
+#endif
+	}
+
+	if (bitmap_file && strcmp(bitmap_file, "internal")==0) {
+		if ((vers%100) < 2) {
+			fprintf(stderr, Name ": internal bitmaps not supported by this kernel.\n");
+			return 1;
+		}
+		if (!st->ss->add_internal_bitmap(st, &bitmap_chunk,
+						 delay, write_behind,
+						 bitmapsize, 1, major_num)) {
+			fprintf(stderr, Name ": Given bitmap chunk size not supported.\n");
+			return 1;
+		}
+		bitmap_file = NULL;
+	}
+
+
+
+	if ((vers % 100) >= 1) { /* can use different versions */
+		mdu_array_info_t inf;
+		memset(&inf, 0, sizeof(inf));
+		inf.major_version = st->ss->major;
+		inf.minor_version = st->minor_version;
+		rv = ioctl(mdfd, SET_ARRAY_INFO, &inf);
+	} else
+		rv = ioctl(mdfd, SET_ARRAY_INFO, NULL);
+	if (rv) {
+		fprintf(stderr, Name ": SET_ARRAY_INFO failed for %s: %s\n",
+			mddev, strerror(errno));
 		return 1;
-	    }
 	}
 
+	if (bitmap_file) {
+		int uuid[4];
+
+		st->ss->uuid_from_super(st, uuid);
+		if (CreateBitmap(bitmap_file, force, (char*)uuid, bitmap_chunk,
+				 delay, write_behind,
+				 bitmapsize,
+				 major_num)) {
+			return 1;
+		}
+		bitmap_fd = open(bitmap_file, O_RDWR);
+		if (bitmap_fd < 0) {
+			fprintf(stderr, Name ": weird: %s cannot be openned\n",
+				bitmap_file);
+			return 1;
+		}
+		if (ioctl(mdfd, SET_BITMAP_FILE, bitmap_fd) < 0) {
+			fprintf(stderr, Name ": Cannot set bitmap file for %s: %s\n",
+				mddev, strerror(errno));
+			return 1;
+		}
+	}
+
+
+
+	for (pass=1; pass <=2 ; pass++) {
+		mddev_dev_t moved_disk = NULL; /* the disk that was moved out of the insert point */
+
+		for (dnum=0, dv = devlist ; dv ;
+		     dv=(dv->next)?(dv->next):moved_disk, dnum++) {
+			int fd;
+			struct stat stb;
+
+			info.disk.number = dnum;
+			if (dnum == insert_point) {
+				moved_disk = dv;
+			}
+			info.disk.raid_disk = info.disk.number;
+			if (info.disk.raid_disk < raiddisks)
+				info.disk.state = (1<<MD_DISK_ACTIVE) |
+						(1<<MD_DISK_SYNC);
+			else
+				info.disk.state = 0;
+			if (dv->writemostly)
+				info.disk.state |= (1<<MD_DISK_WRITEMOSTLY);
+
+			if (dnum == insert_point ||
+			    strcasecmp(dv->devname, "missing")==0) {
+				info.disk.major = 0;
+				info.disk.minor = 0;
+				info.disk.state = (1<<MD_DISK_FAULTY);
+			} else {
+				fd = open(dv->devname, O_RDONLY|O_EXCL, 0);
+				if (fd < 0) {
+					fprintf(stderr, Name ": failed to open %s after earlier success - aborting\n",
+						dv->devname);
+					return 1;
+				}
+				fstat(fd, &stb);
+				info.disk.major = major(stb.st_rdev);
+				info.disk.minor = minor(stb.st_rdev);
+				remove_partitions(fd);
+				close(fd);
+			}
+			switch(pass){
+			case 1:
+				st->ss->add_to_super(st, &info.disk);
+				break;
+			case 2:
+				if (info.disk.state == 1) break;
+				Kill(dv->devname, 0, 1); /* Just be sure it is clean */
+				Kill(dv->devname, 0, 1); /* and again, there could be two superblocks */
+				st->ss->write_init_super(st, &info.disk,
+							 dv->devname);
+
+				if (ioctl(mdfd, ADD_NEW_DISK, &info.disk)) {
+					fprintf(stderr, Name ": ADD_NEW_DISK for %s failed: %s\n",
+						dv->devname, strerror(errno));
+					st->ss->free_super(st);
+					return 1;
+				}
+
+				break;
+			}
+			if (dv == moved_disk && dnum != insert_point) break;
+		}
+	}
+	st->ss->free_super(st);
+
 	/* param is not actually used */
-	if (runstop == 1 || subdevs >= raiddisks) {
+	if (level == LEVEL_CONTAINER)
+		/* No need to start */
+		;
+	else if (runstop == 1 || subdevs >= raiddisks) {
+		mdu_param_t param;
 		if (ioctl(mdfd, RUN_ARRAY, &param)) {
 			fprintf(stderr, Name ": RUN_ARRAY failed: %s\n",
 				strerror(errno));
+			Manage_runstop(mddev, mdfd, -1, 0);
 			return 1;
 		}
-		fprintf(stderr, Name ": array %s started.\n", mddev);
+		if (verbose >= 0)
+			fprintf(stderr, Name ": array %s started.\n", mddev);
 	} else {
-		fprintf(stderr, Name ": not starting array - not enough discs.\n");
+		fprintf(stderr, Name ": not starting array - not enough devices.\n");
 	}
 	return 0;
 }