X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=Create.c;h=36df10ddc65681b34b1fb021793f68c307b0121e;hp=7a4a81dfa674912b32a6e5d7494bb83535a4e200;hb=a7c6e3fb24f8335005a6ff8e0eb668faa257c941;hpb=492350045c7e40741069caa7d017209439db665b

diff --git a/Create.c b/Create.c
index 7a4a81df..36df10dd 100644
--- a/Create.c
+++ b/Create.c
@@ -32,12 +32,50 @@
 #include	"md_p.h"
 #include	<ctype.h>
 
-int Create(struct supertype *st, char *mddev, int mdfd,
+static int default_layout(struct supertype *st, int level, int verbose)
+{
+	int layout = UnSet;
+
+	if (st && st->ss->default_layout)
+		layout = st->ss->default_layout(level);
+
+	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 > 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;
+		}
+
+	return layout;
+}
+
+
+int Create(struct supertype *st, char *mddev,
 	   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)
+	   char *bitmap_file, int bitmap_chunk, int write_behind, int delay, int autof)
 {
 	/*
 	 * Create a new raid array.
@@ -55,6 +93,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 	 * if runstop==run, or raiddisks disks were used,
 	 * RUN_ARRAY
 	 */
+	int mdfd;
 	unsigned long long minsize=0, maxsize=0;
 	char *mindisc = NULL;
 	char *maxdisc = NULL;
@@ -77,26 +116,16 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 	unsigned long long bitmapsize;
 	struct mdinfo info, *infos;
 	int did_default = 0;
+	int do_default_layout = 0;
 	unsigned long safe_mode_delay = 0;
+	char chosen_name[1024];
+	struct map_ent *map = NULL;
+	unsigned long long newsize;
 
 	int major_num = BITMAP_MAJOR_HI;
 
 	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 == UnSet) {
 		/* "ddf" and "imsm" metadata only supports one level - should possibly
 		 * push this into metadata handler??
@@ -158,13 +187,15 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 				else
 					st = NULL;
 			}
+			if (have_container) {
+				subdevs = raiddisks;
+				first_missing = subdevs * 2;
+				second_missing = subdevs * 2;
+				insert_point = subdevs * 2;
+			}
 		}
 		if (fd >= 0)
 			close(fd);
-		if (have_container) {
-			subdevs = 0;
-			devlist = NULL;
-		}
 	}
 	if (st && st->ss->external && sparedisks) {
 		fprintf(stderr,
@@ -187,32 +218,12 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 	}
 
 	/* now set some defaults */
-	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 > 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 (layout == UnSet) {
+		do_default_layout = 1;
+		layout = default_layout(st, level, verbose);
+	}
 
 	if (level == 10)
 		/* check layout fits in array*/
@@ -249,16 +260,25 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 		fprintf(stderr, Name ": unknown level %d\n", level);
 		return 1;
 	}
-
+	
+	if (size && chunk)
+		size &= ~(unsigned long long)(chunk - 1);
+	newsize = size * 2;
 	if (st && ! st->ss->validate_geometry(st, level, layout, raiddisks,
-					      chunk, size, NULL, NULL, verbose>=0))
+					      chunk, size*2, NULL, &newsize, verbose>=0))
 		return 1;
+	if (size == 0) {
+		size = newsize / 2;
+		if (size && verbose > 0)
+			fprintf(stderr, Name ": setting size to %lluK\n",
+				(unsigned long long)size);
+	}
 
 	/* now look at the subdevs */
 	info.array.active_disks = 0;
 	info.array.working_disks = 0;
 	dnum = 0;
-	for (dv=devlist; dv; dv=dv->next, dnum++) {
+	for (dv=devlist; dv && !have_container; dv=dv->next, dnum++) {
 		char *dname = dv->devname;
 		unsigned long long freesize;
 		if (strcasecmp(dname, "missing")==0) {
@@ -285,9 +305,11 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 			char *name = "default";
 			for(i=0; !st && superlist[i]; i++) {
 				st = superlist[i]->match_metadata_desc(name);
+				if (do_default_layout)
+					layout = default_layout(st, level, verbose);
 				if (st && !st->ss->validate_geometry
 					    	(st, level, layout, raiddisks,
-						 chunk, size, dname, &freesize,
+						 chunk, size*2, dname, &freesize,
 						 verbose > 0))
 					st = NULL;
 			}
@@ -302,9 +324,11 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 			    st->minor_version != 90)
 				did_default = 1;
 		} else {
+			if (do_default_layout)
+				layout = default_layout(st, level, verbose);
 			if (!st->ss->validate_geometry(st, level, layout,
 						       raiddisks,
-						       chunk, size, dname,
+						       chunk, size*2, dname,
 						       &freesize,
 						       verbose > 0)) {
 
@@ -324,7 +348,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 		}
 
 		if (size && freesize < size) {
-			fprintf(stderr, Name ": %s is smaller that given size."
+			fprintf(stderr, Name ": %s is smaller than given size."
 				" %lluK < %lluK + metadata\n",
 				dname, freesize, size);
 			fail = 1;
@@ -352,6 +376,8 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 			close(fd);
 		}
 	}
+	if (have_container)
+		info.array.working_disks = raiddisks;
 	if (fail) {
 		fprintf(stderr, Name ": create aborted\n");
 		return 1;
@@ -367,7 +393,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 			/* size is meaningful */
 			if (!st->ss->validate_geometry(st, level, layout,
 						       raiddisks,
-						       chunk, minsize,
+						       chunk, minsize*2,
 						       NULL, NULL, 0)) {
 				fprintf(stderr, Name ": devices too large for RAID level %d\n", level);
 				return 1;
@@ -377,13 +403,21 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 				fprintf(stderr, Name ": size set to %lluK\n", size);
 		}
 	}
-	if (level > 0 && ((maxsize-size)*100 > maxsize)) {
+	if (!have_container && 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",
+			fprintf(stderr, Name ": largest drive (%s) exceeds size (%lluK) by more than 1%%\n",
 				maxdisc, size);
 		warn = 1;
 	}
 
+	if (st->ss->detail_platform && st->ss->detail_platform(0, 1) != 0) {
+		if (runstop != 1 || verbose >= 0)
+			fprintf(stderr, Name ": %s unable to enumerate platform support\n"
+				"    array may not be compatible with hardware/firmware\n",
+				st->ss->name);
+		warn = 1;
+	}
+
 	if (warn) {
 		if (runstop!= 1) {
 			if (!ask("Continue creating array? ")) {
@@ -400,7 +434,8 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 	 * 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) {
+	if (st->ss->external == 0 &&
+	    assume_clean==0 && force == 0 && first_missing >= raiddisks) {
 		switch ( level ) {
 		case 4:
 		case 5:
@@ -433,6 +468,28 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 		return 1;
 	}
 
+	/* We need to create the device */
+	map_lock(&map);
+	mdfd = create_mddev(mddev, name, autof, LOCAL, chosen_name);
+	if (mdfd < 0)
+		return 1;
+	mddev = chosen_name;
+
+	vers = md_get_version(mdfd);
+	if (vers < 9000) {
+		fprintf(stderr, Name ": Create requires md driver version 0.90.0 or later\n");
+		goto abort;
+	} 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");
+			goto abort;
+		}
+	}
+
 	/* Ok, lets try some ioctls */
 
 	info.array.level = level;
@@ -508,6 +565,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 		 *  /dev/md/home -> home
 		 *  /dev/mdhome -> home
 		 */
+		/* FIXME compare this with rules in create_mddev */
 		name = strrchr(mddev, '/');
 		if (name) {
 			name++;
@@ -524,7 +582,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 		}
 	}
 	if (!st->ss->init_super(st, &info.array, size, name, homehost, uuid))
-		return 1;
+		goto abort;
 
 	total_slots = info.array.nr_disks;
 	sysfs_init(&info, mdfd, 0);
@@ -552,6 +610,10 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 				" %s metadata\n", info.text_version);
 	}
 
+	map_update(&map, fd2devnum(mdfd), info.text_version,
+		   info.uuid, chosen_name);
+	map_unlock(&map);
+
 	if (bitmap_file && vers < 9003) {
 		major_num = BITMAP_MAJOR_HOSTENDIAN;
 #ifdef __BIG_ENDIAN
@@ -563,13 +625,13 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 	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;
+			goto abort;
 		}
 		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;
+			goto abort;
 		}
 		bitmap_file = NULL;
 	}
@@ -596,7 +658,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 		if (container_fd < 0) {
 			fprintf(stderr, Name ": Cannot get exclusive "
 				"open on container - weird.\n");
-			return 1;
+			goto abort;
 		}
 		if (mdmon_running(st->container_dev)) {
 			if (verbose)
@@ -611,7 +673,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 	if (rv) {
 		fprintf(stderr, Name ": failed to set array info for %s: %s\n",
 			mddev, strerror(errno));
-		return 1;
+		goto abort;
 	}
 
 	if (bitmap_file) {
@@ -622,18 +684,18 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 				 delay, write_behind,
 				 bitmapsize,
 				 major_num)) {
-			return 1;
+			goto abort;
 		}
 		bitmap_fd = open(bitmap_file, O_RDWR);
 		if (bitmap_fd < 0) {
 			fprintf(stderr, Name ": weird: %s cannot be openned\n",
 				bitmap_file);
-			return 1;
+			goto abort;
 		}
 		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;
+			goto abort;
 		}
 	}
 
@@ -652,10 +714,15 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 				abort();
 			if (dnum == insert_point) {
 				moved_disk = dv;
+				continue;
 			}
-			if (dnum == insert_point ||
-			    strcasecmp(dv->devname, "missing")==0)
+			if (strcasecmp(dv->devname, "missing")==0)
 				continue;
+			if (have_container)
+				moved_disk = NULL;
+			if (have_container && dnum < info.array.raid_disks - 1)
+				/* repeatedly use the container */
+				moved_disk = dv;
 
 			switch(pass) {
 			case 1:
@@ -669,33 +736,46 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 				else
 					inf->disk.state = 0;
 
-				if (dv->writemostly)
+				if (dv->writemostly == 1)
 					inf->disk.state |= (1<<MD_DISK_WRITEMOSTLY);
 
-				if (st->ss->external && st->subarray[0])
-					fd = open(dv->devname, O_RDWR);
-				else
-					fd = open(dv->devname, O_RDWR|O_EXCL);
-
-				if (fd < 0) {
-					fprintf(stderr, Name ": failed to open %s "
-						"after earlier success - aborting\n",
-						dv->devname);
-					return 1;
+				if (have_container)
+					fd = -1;
+				else {
+					if (st->ss->external && st->subarray[0])
+						fd = open(dv->devname, O_RDWR);
+					else
+						fd = open(dv->devname, O_RDWR|O_EXCL);
+
+					if (fd < 0) {
+						fprintf(stderr, Name ": failed to open %s "
+							"after earlier success - aborting\n",
+							dv->devname);
+						goto abort;
+					}
+					fstat(fd, &stb);
+					inf->disk.major = major(stb.st_rdev);
+					inf->disk.minor = minor(stb.st_rdev);
 				}
-				fstat(fd, &stb);
-				inf->disk.major = major(stb.st_rdev);
-				inf->disk.minor = minor(stb.st_rdev);
-
-				remove_partitions(fd);
-				st->ss->add_to_super(st, &inf->disk,
-						     fd, dv->devname);
+				if (fd >= 0)
+					remove_partitions(fd);
+				if (st->ss->add_to_super(st, &inf->disk,
+							 fd, dv->devname))
+					goto abort;
 				st->ss->getinfo_super(st, inf);
 				safe_mode_delay = inf->safe_mode_delay;
 
-				/* getinfo_super might have lost these ... */
-				inf->disk.major = major(stb.st_rdev);
-				inf->disk.minor = minor(stb.st_rdev);
+				if (have_container && verbose > 0)
+					fprintf(stderr, Name ": Using %s for device %d\n",
+						map_dev(inf->disk.major,
+							inf->disk.minor,
+							0), dnum);
+
+				if (!have_container) {
+					/* getinfo_super might have lost these ... */
+					inf->disk.major = major(stb.st_rdev);
+					inf->disk.minor = minor(stb.st_rdev);
+				}
 				break;
 			case 2:
 				inf->errors = 0;
@@ -709,11 +789,12 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 						"failed: %s\n",
 						dv->devname, strerror(errno));
 					st->ss->free_super(st);
-					return 1;
+					goto abort;
 				}
 				break;
 			}
-			if (dv == moved_disk && dnum != insert_point) break;
+			if (!have_container &&
+			    dv == moved_disk && dnum != insert_point) break;
 		}
 		if (pass == 1) {
 			st->ss->write_init_super(st);
@@ -723,11 +804,14 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 	free(infos);
 	st->ss->free_super(st);
 
-	/* param is not actually used */
-	if (level == LEVEL_CONTAINER)
-		/* No need to start */
-		;
-	else if (runstop == 1 || subdevs >= raiddisks) {
+	if (level == LEVEL_CONTAINER) {
+		/* No need to start.  But we should signal udev to
+		 * create links */
+		sysfs_uevent(&info, "change");
+		if (verbose >= 0)
+			fprintf(stderr, Name ": container %s prepared.\n", mddev);
+		wait_for(chosen_name, mdfd);
+	} else if (runstop == 1 || subdevs >= raiddisks) {
 		if (st->ss->external) {
 			switch(level) {
 			case LEVEL_LINEAR:
@@ -744,12 +828,13 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 			}
 			sysfs_set_safemode(&info, safe_mode_delay);
 		} else {
+			/* param is not actually used */
 			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;
+				goto abort;
 			}
 		}
 		if (verbose >= 0)
@@ -761,8 +846,15 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 			ping_monitor(devnum2devname(st->container_dev));
 			close(container_fd);
 		}
+		wait_for(chosen_name, mdfd);
 	} else {
 		fprintf(stderr, Name ": not starting array - not enough devices.\n");
 	}
+	close(mdfd);
 	return 0;
+
+ abort:
+	if (mdfd >= 0)
+		close(mdfd);
+	return 1;
 }