X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=Incremental.c;h=9b22220604fc463f9fbba2ebc7fb493ac7d41ac7;hp=2c03a1464773f17e5ede0b09a012ec8a7f57dd1e;hb=8850ee3e1ea01d4ded658fd83002fd93a81d6e99;hpb=2318b9f0dc98b03d3e3374e41b2ca6f85b18f922

diff --git a/Incremental.c b/Incremental.c
index 2c03a146..9b222206 100644
--- a/Incremental.c
+++ b/Incremental.c
@@ -237,6 +237,7 @@ int Incremental(char *devname, int verbose, int runstop,
 		/* Have to guess a bit. */
 		int use_partitions = 1;
 		char *np, *ep;
+		char *nm, nbuf[1024];
 		if ((autof&7) == 3 || (autof&7) == 5)
 			use_partitions = 0;
 		np = strchr(info.name, ':');
@@ -252,6 +253,24 @@ int Incremental(char *devname, int verbose, int runstop,
 		} else
 			devnum = -1;
 
+		if (match)
+			nm = match->devname;
+		else {
+			sprintf(nbuf, "/dev/md/%s", np);
+			nm = nbuf;
+		}
+		if (stat(nm, &stb) == 0 &&
+		    S_ISBLK(stb.st_mode) &&
+		    major(stb.st_rdev) == (use_partitions ?
+					   get_mdp_major() : MD_MAJOR)) {
+			if (use_partitions)
+				devnum = minor(stb.st_rdev) >> MdpMinorShift;
+			else
+				devnum = minor(stb.st_rdev);
+			if (mddev_busy(use_partitions ? (-1-devnum) : devnum))
+				devnum = -1;
+		}
+
 		if (devnum < 0) {
 			/* Haven't found anything yet, choose something free */
 			devnum = find_free_devnum(use_partitions);
@@ -281,12 +300,11 @@ int Incremental(char *devname, int verbose, int runstop,
 	/* - add the device */
 		mdu_array_info_t ainf;
 		mdu_disk_info_t disk;
-		char md[20];
 		struct mdinfo *sra;
 
 		memset(&ainf, 0, sizeof(ainf));
-		ainf.major_version = st->ss->major;
-		ainf.minor_version = st->minor_version;
+		ainf.major_version = info.array.major_version;
+		ainf.minor_version = info.array.minor_version;
 		if (ioctl(mdfd, SET_ARRAY_INFO, &ainf) != 0) {
 			fprintf(stderr, Name
 				": SET_ARRAY_INFO failed for %s: %s\b",
@@ -294,9 +312,8 @@ int Incremental(char *devname, int verbose, int runstop,
 			close(mdfd);
 			return 2;
 		}
-		sprintf(md, "%d.%d\n", st->ss->major, st->minor_version);
 		sra = sysfs_read(mdfd, devnum, GET_VERSION);
-		sysfs_set_str(sra, NULL, "metadata_version", md);
+		sysfs_set_str(sra, NULL, "metadata_version", info.text_version);
 		memset(&disk, 0, sizeof(disk));
 		disk.major = major(stb.st_rdev);
 		disk.minor = minor(stb.st_rdev);
@@ -333,29 +350,18 @@ int Incremental(char *devname, int verbose, int runstop,
 		int err;
 		struct mdinfo *sra;
 		struct supertype *st2;
-		sra = sysfs_read(mdfd, devnum, (GET_VERSION | GET_DEVS |
-						GET_STATE));
+		sra = sysfs_read(mdfd, devnum, (GET_DEVS | GET_STATE));
 
-		if (sra->array.major_version != st->ss->major ||
-		    sra->array.minor_version != st->minor_version) {
-			if (verbose >= 0)
-				fprintf(stderr, Name
-	      ": %s has different metadata to chosen array %s %d.%d %d.%d.\n",
-					devname, chosen_name,
-					sra->array.major_version,
-					sra->array.minor_version,
-					st->ss->major, st->minor_version);
-			close(mdfd);
-			return 1;
-		}
 		sprintf(dn, "%d:%d", sra->devs->disk.major,
 			sra->devs->disk.minor);
 		dfd2 = dev_open(dn, O_RDONLY);
 		st2 = dup_super(st);
-		if (st2->ss->load_super(st2, dfd2, NULL)) {
+		if (st2->ss->load_super(st2, dfd2, NULL) ||
+		    st->ss->compare_super(st, st2) != 0) {
 			fprintf(stderr, Name
-				": Strange error loading metadata for %s.\n",
-				chosen_name);
+				": metadata mismatch between %s and "
+				"chosen array %s\n",
+				devname, chosen_name);
 			close(mdfd);
 			close(dfd2);
 			return 2;
@@ -393,8 +399,7 @@ int Incremental(char *devname, int verbose, int runstop,
 	}
 	/* 6/ Make sure /var/run/mdadm.map contains this array. */
 	map_update(&map, devnum,
-		   info.array.major_version,
-		   info.array.minor_version,
+		   info.text_version,
 		   info.uuid, chosen_name);
 
 	/* 7/ Is there enough devices to possibly start the array? */
@@ -628,8 +633,8 @@ void RebuildMap(void)
 				path = map_dev(MD_MAJOR, md->devnum, 0);
 			else
 				path = map_dev(mdp, (-1-md->devnum)<< 6, 0);
-			map_add(&map, md->devnum, st->ss->major,
-				st->minor_version,
+			map_add(&map, md->devnum,
+				info.text_version,
 				info.uuid, path ? : "/unknown");
 			st->ss->free_super(st);
 			break;
@@ -722,7 +727,7 @@ static char *container2devname(char *devname)
 	int fd = open(devname, O_RDONLY);
 	char *mdname = NULL;
 
-	if (fd > 0) {
+	if (fd >= 0) {
 		mdname = devnum2devname(fd2devnum(fd));
 		close(fd);
 	}
@@ -774,6 +779,28 @@ int Incremental_container(struct supertype *st, char *devname, int verbose,
 				devnum = -1;
 		}
 
+		if (devnum < 0) {
+			char *nm = ra->name;
+			char nbuf[1024];
+			struct stat stb;
+			if (strchr(nm, ':'))
+				nm = strchr(nm, ':')+1;
+			sprintf(nbuf, "/dev/md/%s", nm);
+
+			if (stat(nbuf, &stb) == 0 &&
+			    S_ISBLK(stb.st_mode) &&
+			    major(stb.st_rdev) == (usepart ?
+						   get_mdp_major() : MD_MAJOR)){
+				if (usepart)
+					devnum = minor(stb.st_rdev)
+						>> MdpMinorShift;
+				else
+					devnum = minor(stb.st_rdev);
+				if (mddev_busy(usepart ? (-1-devnum) : devnum))
+					devnum = -1;
+			}
+		}
+
 		if (devnum >= 0)
 			devnum = usepart ? (-1-devnum) : devnum;
 		else
@@ -789,7 +816,7 @@ int Incremental_container(struct supertype *st, char *devname, int verbose,
 
 		sra = sysfs_read(mdfd, 0, 0);
 
-		sprintf(ver, "external:/%s/%d", mdname, ra->container_member);
+		sprintf(ver, "external:%s", ra->text_version);
 		sysfs_set_str(sra, NULL, "metadata_version", ver);
 
 		sysfs_set_array(sra, ra);
@@ -808,11 +835,16 @@ int Incremental_container(struct supertype *st, char *devname, int verbose,
 			default:
 				sysfs_set_str(sra, NULL, "array_state",
 					      "readonly");
+				/* start mdmon if needed. */
+				if (!mdmon_running(st->container_dev))
+					start_mdmon(st->container_dev);
+				ping_monitor(devnum2devname(st->container_dev));
 				break;
 			}
 			if (verbose >= 0)
 				printf("Started %s with %d devices\n",
 				       chosen_name, working);
+			/* FIXME should have an O_EXCL and wait for read-auto */
 		} else
 			if (verbose >= 0)
 				printf("%s assembled with %d devices but "