X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=Assemble.c;h=ace5717c310adb7dc932b21dd30bc67756025df9;hp=0d222512d0c271fc1a904ab37709ae8a283c2258;hb=d7eaf49f65ecb99e24255026331b0af7a9245cc2;hpb=98c6faba80e6db0693f99faf5c6525ef4f1fb680

diff --git a/Assemble.c b/Assemble.c
index 0d222512..ace5717c 100644
--- a/Assemble.c
+++ b/Assemble.c
@@ -193,7 +193,7 @@ int Assemble(char *mddev, int mdfd,
 			continue;
 		}
 		
-		dfd = open(devname, O_RDONLY, 0);
+		dfd = open(devname, O_RDONLY|O_EXCL, 0);
 		if (dfd < 0) {
 			if (inargv || verbose)
 				fprintf(stderr, Name ": cannot open device %s: %s\n",
@@ -288,7 +288,7 @@ int Assemble(char *mddev, int mdfd,
 			if (strcmp(update, "super-minor") ==0) {
 				struct stat stb2;
 				fstat(mdfd, &stb2);
-				super.md_minor = MINOR(stb2.st_rdev);
+				super.md_minor = minor(stb2.st_rdev);
 				if (verbose)
 					fprintf(stderr, Name ": updating superblock of %s with minor number %d\n",
 						devname, super.md_minor);
@@ -320,8 +320,13 @@ int Assemble(char *mddev, int mdfd,
 					} else if (i >= super.raid_disks && super.disks[i].number == 0)
 						super.disks[i].state = 0;
 			}
+			if (strcmp(update, "resync") == 0) {
+				/* make sure resync happens */
+				super.state &= ~(1<<MD_SB_CLEAN);
+				super.recovery_cp = 0;
+			}
 			super.sb_csum = calc_sb_csum(&super);
-			dfd = open(devname, O_RDWR, 0);
+			dfd = open(devname, O_RDWR|O_EXCL, 0);
 			if (dfd < 0) 
 				fprintf(stderr, Name ": Cannot open %s for superblock update\n",
 					devname);
@@ -336,8 +341,8 @@ int Assemble(char *mddev, int mdfd,
 			fprintf(stderr, Name ": %s is identified as a member of %s, slot %d.\n",
 				devname, mddev, super.this_disk.raid_disk);
 		devices[devcnt].devname = devname;
-		devices[devcnt].major = MAJOR(stb.st_rdev);
-		devices[devcnt].minor = MINOR(stb.st_rdev);
+		devices[devcnt].major = major(stb.st_rdev);
+		devices[devcnt].minor = minor(stb.st_rdev);
 		devices[devcnt].oldmajor = super.this_disk.major;
 		devices[devcnt].oldminor = super.this_disk.minor;
 		devices[devcnt].events = md_event(&super);
@@ -430,7 +435,7 @@ int Assemble(char *mddev, int mdfd,
 			devices[chosen_drive].devname, devices[chosen_drive].raid_disk,
 			(int)(devices[chosen_drive].events),
 			(int)(devices[most_recent].events));
-		fd = open(devices[chosen_drive].devname, O_RDWR);
+		fd = open(devices[chosen_drive].devname, O_RDWR|O_EXCL);
 		if (fd < 0) {
 			fprintf(stderr, Name ": Couldn't open %s for write - not updating\n",
 				devices[chosen_drive].devname);
@@ -479,7 +484,7 @@ int Assemble(char *mddev, int mdfd,
 		if (!devices[j].uptodate)
 			continue;
 		chosen_drive = j;
-		if ((fd=open(devices[j].devname, O_RDONLY))< 0) {
+		if ((fd=open(devices[j].devname, O_RDONLY|O_EXCL))< 0) {
 			fprintf(stderr, Name ": Cannot open %s: %s\n",
 				devices[j].devname, strerror(errno));
 			return 1;
@@ -551,7 +556,7 @@ This doesnt work yet
 	    || (old_linux && (change & 1))) {
 		int fd;
 		super.sb_csum = calc_sb_csum(&super);
-		fd = open(devices[chosen_drive].devname, O_RDWR);
+		fd = open(devices[chosen_drive].devname, O_RDWR|O_EXCL);
 		if (fd < 0) {
 			fprintf(stderr, Name ": Could open %s for write - cannot Assemble array.\n",
 				devices[chosen_drive].devname);
@@ -605,7 +610,7 @@ This doesnt work yet
 						devices[j].devname,
 						mddev,
 						strerror(errno));
-					if (i < first_super.raid_disks)
+					if (i < first_super.raid_disks || i == bestcnt)
 						okcnt--;
 					else
 						sparecnt--;
@@ -660,7 +665,7 @@ This doesnt work yet
 		 * so we can just start the array
 		 */
 		unsigned long dev;
-		dev = MKDEV(devices[chosen_drive].major,
+		dev = makedev(devices[chosen_drive].major,
 			    devices[chosen_drive].minor);
 		if (ioctl(mdfd, START_ARRAY, dev)) {
 		    fprintf(stderr, Name ": Cannot start array: %s\n",