Use O_EXCL when opening component devices to be assembled into an array

[thirdparty/mdadm.git] / Assemble.c

diff --git a/Assemble.c b/Assemble.c
index 794b00d43421909cc6f91582aa5c4fc777abd2ed..ace5717c310adb7dc932b21dd30bc67756025df9 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -98,8 +98,8 @@ int Assemble(char *mddev, int mdfd,
        mdp_super_t first_super, super;
        struct {
                char *devname;
-               int major, minor;
-               int oldmajor, oldminor;
+               unsigned int major, minor;
+               unsigned int oldmajor, oldminor;
                long long events;
                time_t utime;
                int uptodate;
@@ -107,16 +107,17 @@ int Assemble(char *mddev, int mdfd,
                int raid_disk;
        } *devices;
        int *best = NULL; /* indexed by raid_disk */
-       int bestcnt = 0;
-       int devcnt = 0, okcnt, sparecnt;
-       int req_cnt;
-       int i;
+       unsigned int bestcnt = 0;
+       int devcnt = 0;
+       unsigned int okcnt, sparecnt;
+       unsigned int req_cnt;
+       unsigned int i;
        int most_recent = 0;
        int chosen_drive;
        int change = 0;
        int inargv = 0;
        int start_partial_ok = force || devlist==NULL;
-       int num_devs;
+       unsigned int num_devs;
        mddev_dev_t tmpdev;
        
        vers = md_get_version(mdfd);
@@ -192,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",
@@ -224,21 +225,21 @@ int Assemble(char *mddev, int mdfd,
                                        devname);
                        continue;
                }
-               if (ident->super_minor >= 0 &&
+               if (ident->super_minor != UnSet &&
                    (!havesuper || ident->super_minor != super.md_minor)) {
                        if (inargv || verbose)
                                fprintf(stderr, Name ": %s has wrong super-minor.\n",
                                        devname);
                        continue;
                }
-               if (ident->level != -10 &&
-                   (!havesuper|| ident->level != super.level)) {
+               if (ident->level != UnSet &&
+                   (!havesuper|| ident->level != (int)super.level)) {
                        if (inargv || verbose)
                                fprintf(stderr, Name ": %s has wrong raid level.\n",
                                        devname);
                        continue;
                }
-               if (ident->raid_disks != -1 &&
+               if (ident->raid_disks != UnSet &&
                    (!havesuper || ident->raid_disks!= super.raid_disks)) {
                        if (inargv || verbose)
                                fprintf(stderr, Name ": %s requires wrong number of drives.\n",
@@ -287,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);
@@ -319,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);
@@ -335,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);
@@ -349,16 +355,16 @@ int Assemble(char *mddev, int mdfd,
                            > devices[most_recent].events)
                                most_recent = devcnt;
                }
-               if (super.level == -4) 
+               if ((int)super.level == -4) 
                        /* with multipath, the raid_disk from the superblock is meaningless */
                        i = devcnt;
                else
                        i = devices[devcnt].raid_disk;
-               if (i>=0 && i < 10000) {
+               if (i < 10000) {
                        if (i >= bestcnt) {
-                               int newbestcnt = i+10;
+                               unsigned int newbestcnt = i+10;
                                int *newbest = malloc(sizeof(int)*newbestcnt);
-                               int c;
+                               unsigned int c;
                                for (c=0; c < newbestcnt; c++)
                                        if (c < bestcnt)
                                                newbest[c] = best[c];
@@ -392,7 +398,7 @@ int Assemble(char *mddev, int mdfd,
                /* note: we ignore error flags in multipath arrays
                 * as they don't make sense
                 */
-               if (first_super.level != -4)
+               if ((int)first_super.level != -4)
                        if (!(devices[j].state & (1<<MD_DISK_SYNC))) {
                                if (!(devices[j].state & (1<<MD_DISK_FAULTY)))
                                        sparecnt++;
@@ -429,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);
@@ -478,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;
@@ -494,7 +500,7 @@ int Assemble(char *mddev, int mdfd,
 
        for (i=0; i<bestcnt; i++) {
                int j = best[i];
-               int desired_state;
+               unsigned int desired_state;
 
                if (i < super.raid_disks)
                        desired_state = (1<<MD_DISK_ACTIVE) | (1<<MD_DISK_SYNC);
@@ -550,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);
@@ -604,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--;
@@ -659,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",