X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=Build.c;fp=Build.c;h=2d9f68f0311515c5ae48f64c40130e850e445147;hp=21fe2a51d3fd0b25d1ed5712b69de39818b8ca61;hb=8320878543bb5e49b5acb24fa919ff11be485c61;hpb=c9f39c1b9bafbd18ce3831c8da6865b21827fef3

diff --git a/Build.c b/Build.c
index 21fe2a51..2d9f68f0 100644
--- a/Build.c
+++ b/Build.c
@@ -33,11 +33,10 @@
 #define START_MD     		_IO (MD_MAJOR, 2)
 #define STOP_MD      		_IO (MD_MAJOR, 3)
 
-int Build(char *mddev, int mdfd, int chunk, int level, int layout,
-	  int raiddisks,
-	  mddev_dev_t devlist, int assume_clean,
-	  char *bitmap_file, int bitmap_chunk, int write_behind, int delay,
-	  int verbose, unsigned long long size)
+int Build(char *mddev, int chunk, int level, int layout,
+	  int raiddisks, mddev_dev_t devlist, int assume_clean,
+	  char *bitmap_file, int bitmap_chunk, int write_behind,
+	  int delay, int verbose, int autof, unsigned long long size)
 {
 	/* Build a linear or raid0 arrays without superblocks
 	 * We cannot really do any checks, we just do it.
@@ -59,6 +58,10 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
 	mddev_dev_t dv;
 	int bitmap_fd;
 	unsigned long long bitmapsize;
+	int mdfd;
+	char chosen_name[1024];
+	int uuid[4] = {0,0,0,0};
+	struct map_ent *map = NULL;
 
 	/* scan all devices, make sure they really are block devices */
 	for (dv = devlist; dv; dv=dv->next) {
@@ -112,6 +115,18 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
 			break;
 		}
 
+	/* We need to create the device.  It can have no name. */
+	map_lock(&map);
+	mdfd = create_mddev(mddev, NULL, autof, LOCAL,
+			    chosen_name);
+	if (mdfd < 0) {
+		map_unlock(&map);
+		return 1;
+	}
+	mddev = chosen_name;
+
+	map_update(&map, fd2devnum(mdfd), "none", uuid, chosen_name);
+	map_unlock(&map);
 
 	vers = md_get_version(mdfd);
 
@@ -140,17 +155,17 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
 		if (ioctl(mdfd, SET_ARRAY_INFO, &array)) {
 			fprintf(stderr, Name ": SET_ARRAY_INFO failed for %s: %s\n",
 				mddev, strerror(errno));
-			return 1;
+			goto abort;
 		}
 	} else if (bitmap_file) {
 		fprintf(stderr, Name ": bitmaps not supported with this kernel\n");
-		return 1;
+		goto abort;
 	}
 
 	if (bitmap_file && level <= 0) {
 		fprintf(stderr, Name ": bitmaps not meaningful with level %s\n",
 			map_num(pers, level)?:"given");
-		return 1;
+		goto abort;
 	}
 	/* now add the devices */
 	for ((i=0), (dv = devlist) ; dv ; i++, dv=dv->next) {
@@ -211,7 +226,7 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
 				if (bitmap_chunk == UnSet) {
 					fprintf(stderr, Name ": %s cannot be openned.",
 						bitmap_file);
-					return 1;
+					goto abort;
 				}
 #endif
 				if (vers < 9003) {
@@ -224,20 +239,20 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
 				bitmapsize = size>>9; /* FIXME wrong for RAID10 */
 				if (CreateBitmap(bitmap_file, 1, NULL, bitmap_chunk,
 						 delay, write_behind, bitmapsize, major)) {
-					return 1;
+					goto abort;
 				}
 				bitmap_fd = open(bitmap_file, O_RDWR);
 				if (bitmap_fd < 0) {
 					fprintf(stderr, Name ": %s cannot be openned.",
 						bitmap_file);
-					return 1;
+					goto abort;
 				}
 			}
 			if (bitmap_fd >= 0) {
 				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;
 				}
 			}
 		}
@@ -265,6 +280,8 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
 	if (verbose >= 0)
 		fprintf(stderr, Name ": array %s built and started.\n",
 			mddev);
+	wait_for(mddev, mdfd);
+	close(mdfd);
 	return 0;
 
  abort:
@@ -272,5 +289,6 @@ int Build(char *mddev, int mdfd, int chunk, int level, int layout,
 	    ioctl(mdfd, STOP_ARRAY, 0);
 	else
 	    ioctl(mdfd, STOP_MD, 0);
+	close(mdfd);
 	return 1;
 }