X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=Create.c;h=b7a3f7d239cbfcf3d9abdbaf6b2b28ec021b2e6a;hp=6cf509aa16687c7f57421e140213ca015dd39e37;hb=06c7f68e40134cbef3186426ebf63c4f6d4e30f5;hpb=213ee40bd2d0e09288b629a80fa85816f45fe48b

diff --git a/Create.c b/Create.c
index 6cf509aa..b7a3f7d2 100644
--- a/Create.c
+++ b/Create.c
@@ -70,11 +70,11 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 	int rv;
 	int bitmap_fd;
 	unsigned long long bitmapsize;
+	struct mdinfo info;
 
-	mdu_array_info_t array;
 	int major_num = BITMAP_MAJOR_HI;
 
-	memset(&array, 0, sizeof(array));
+	memset(&info, 0, sizeof(info));
 
 	vers = md_get_version(mdfd);
 	if (vers < 9000) {
@@ -193,8 +193,8 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 	}
 
 	/* now look at the subdevs */
-	array.active_disks = 0;
-	array.working_disks = 0;
+	info.array.active_disks = 0;
+	info.array.working_disks = 0;
 	dnum = 0;
 	for (dv=devlist; dv; dv=dv->next, dnum++) {
 		char *dname = dv->devname;
@@ -206,9 +206,9 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 			missing_disks ++;
 			continue;
 		}
-		array.working_disks++;
+		info.array.working_disks++;
 		if (dnum < raiddisks)
-			array.active_disks++;
+			info.array.active_disks++;
 		fd = open(dname, O_RDONLY|O_EXCL, 0);
 		if (fd <0 ) {
 			fprintf(stderr, Name ": Cannot open %s: %s\n",
@@ -334,7 +334,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 		case 5:
 			insert_point = raiddisks-1;
 			sparedisks++;
-			array.active_disks--;
+			info.array.active_disks--;
 			missing_disks++;
 			break;
 		default:
@@ -350,16 +350,16 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 
 	/* Ok, lets try some ioctls */
 
-	array.level = level;
-	array.size = size;
-	array.raid_disks = raiddisks;
+	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
 	 */
-	array.md_minor = 0;
+	info.array.md_minor = 0;
 	if (fstat(mdfd, &stb)==0)
-		array.md_minor = minor(stb.st_rdev);
-	array.not_persistent = 0;
+		info.array.md_minor = minor(stb.st_rdev);
+	info.array.not_persistent = 0;
 	/*** FIX: Need to do something about RAID-6 here ***/
 	if ( ( (level == 4 || level == 5) &&
 	       (insert_point < raiddisks || first_missing < raiddisks) )
@@ -368,9 +368,9 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 	     ||
 	     assume_clean
 		)
-		array.state = 1; /* clean, but one+ drive will be missing */
+		info.array.state = 1; /* clean, but one+ drive will be missing*/
 	else
-		array.state = 0; /* not clean, but no errors */
+		info.array.state = 0; /* not clean, but no errors */
 
 	if (level == 10) {
 		/* for raid10, the bitmap size is the capacity of the array,
@@ -402,12 +402,13 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 	 * So for now, we assume that all raid and spare
 	 * devices will be given.
 	 */
-	array.spare_disks=sparedisks;
-	array.failed_disks=missing_disks;
-	array.nr_disks = array.working_disks + array.failed_disks;
-	array.layout = layout;
-	array.chunk_size = chunk*1024;
-	array.major_version = st->ss->major;
+	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 */
@@ -433,7 +434,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 				name += 2;
 		}
 	}
-	if (!st->ss->init_super(st, &array, size, name, homehost, uuid))
+	if (!st->ss->init_super(st, &info.array, size, name, homehost, uuid))
 		return 1;
 
 	if (bitmap_file && vers < 9003) {
@@ -506,26 +507,25 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 		     dv=(dv->next)?(dv->next):moved_disk, dnum++) {
 			int fd;
 			struct stat stb;
-			mdu_disk_info_t disk;
 
-			disk.number = dnum;
+			info.disk.number = dnum;
 			if (dnum == insert_point) {
 				moved_disk = dv;
 			}
-			disk.raid_disk = disk.number;
-			if (disk.raid_disk < raiddisks)
-				disk.state = (1<<MD_DISK_ACTIVE) |
+			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
-				disk.state = 0;
+				info.disk.state = 0;
 			if (dv->writemostly)
-				disk.state |= (1<<MD_DISK_WRITEMOSTLY);
+				info.disk.state |= (1<<MD_DISK_WRITEMOSTLY);
 
 			if (dnum == insert_point ||
 			    strcasecmp(dv->devname, "missing")==0) {
-				disk.major = 0;
-				disk.minor = 0;
-				disk.state = (1<<MD_DISK_FAULTY);
+				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) {
@@ -534,23 +534,23 @@ int Create(struct supertype *st, char *mddev, int mdfd,
 					return 1;
 				}
 				fstat(fd, &stb);
-				disk.major = major(stb.st_rdev);
-				disk.minor = minor(stb.st_rdev);
+				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, &disk);
+				st->ss->add_to_super(st, &info.disk);
 				break;
 			case 2:
-				if (disk.state == 1) break;
+				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, &disk,
+				st->ss->write_init_super(st, &info.disk,
 							 dv->devname);
 
-				if (ioctl(mdfd, ADD_NEW_DISK, &disk)) {
+				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);