mdopen.c don't shadow major() and minor()

[thirdparty/mdadm.git] / Monitor.c

diff --git a/Monitor.c b/Monitor.c
index 6a4c8dec0ba27c1e0d5dc4eb8e0fd339e8fe9da4..246bdc02b6b73deffcf7c2e1d4756050db2490df 100644 (file)
--- a/Monitor.c
+++ b/Monitor.c
@@ -31,7 +31,7 @@
 #include       "md_p.h"
 #include       "md_u.h"
 #include       <sys/wait.h>
-#include       <sys/signal.h>
+#include       <signal.h>
 #include       <values.h>
 #include       <syslog.h>
 
@@ -234,6 +234,7 @@ int Monitor(mddev_dev_t devlist,
 */                             st->err=1;
                                continue;
                        }
+                       fcntl(fd, F_SETFD, FD_CLOEXEC);
                        if (ioctl(fd, GET_ARRAY_INFO, &array)<0) {
                                if (!st->err)
                                        alert("DeviceDisappeared", dev, NULL,
@@ -244,8 +245,10 @@ int Monitor(mddev_dev_t devlist,
                                close(fd);
                                continue;
                        }
-                       if (array.level != 1 && array.level != 5 && array.level != -4 &&
-                               array.level != 6 && array.level != 10) {
+                       /* It's much easier to list what array levels can't
+                        * have a device disappear than all of them that can
+                        */
+                       if (array.level == 0 || array.level == -1) {
                                if (!st->err)
                                        alert("DeviceDisappeared", dev, "Wrong-Level",
                                              mailaddr, mailfrom, alert_cmd, dosyslog);
@@ -328,6 +331,7 @@ int Monitor(mddev_dev_t devlist,
                        for (i=0; i<MaxDisks && i <= array.raid_disks + array.nr_disks;
                             i++) {
                                mdu_disk_info_t disc;
+                               disc.number = i;
                                if (ioctl(fd, GET_DISK_INFO, &disc) >= 0) {
                                        info[i].state = disc.state;
                                        info[i].major = disc.major;
@@ -338,7 +342,7 @@ int Monitor(mddev_dev_t devlist,
                        close(fd);
 
                        for (i=0; i<MaxDisks; i++) {
-                               mdu_disk_info_t disc;
+                               mdu_disk_info_t disc = {0};
                                int newstate=0;
                                int change;
                                char *dv = NULL;
@@ -383,7 +387,7 @@ int Monitor(mddev_dev_t devlist,
                                                )
                                                alert("SpareActive", dev, dv, mailaddr, mailfrom, alert_cmd, dosyslog);
                                }
-                               st->devstate[i] = disc.state;
+                               st->devstate[i] = newstate;
                                st->devid[i] = makedev(disc.major, disc.minor);
                        }
                        st->active = array.active_disks;
@@ -399,9 +403,8 @@ int Monitor(mddev_dev_t devlist,
                        struct mdstat_ent *mse;
                        for (mse=mdstat; mse; mse=mse->next) 
                                if (mse->devnum != MAXINT &&
-                                   (strcmp(mse->level, "raid1")==0 ||
-                                    strcmp(mse->level, "raid5")==0 ||
-                                    strcmp(mse->level, "multipath")==0)
+                                   (strcmp(mse->level, "raid0")!=0 &&
+                                    strcmp(mse->level, "linear")!=0)
                                        ) {
                                        struct state *st = malloc(sizeof *st);
                                        mdu_array_info_t array;
@@ -601,7 +604,7 @@ int Wait(char *dev)
        if (major(stb.st_rdev) == MD_MAJOR)
                devnum = minor(stb.st_rdev);
        else
-               devnum = -minor(stb.st_rdev)/16;
+               devnum = -1-(minor(stb.st_rdev)/64);
 
        while(1) {
                struct mdstat_ent *ms = mdstat_read(1, 0);