mdmon: pass symbolic name to mdmon instead of device name.

Now that names in /dev are usually created (eventually) by udev,
it isn't really safe to rely in finding a name in /dev to pass to
mdmon to identify which array to monitor.
And it isn't really necessary to have a name in /dev.
So just pass the symbolic name, e.g. md127 or md123.

Change util.c to pass that name, and change mdmon to process the
name sensibly.

Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/mdadm.h b/mdadm.h
index 2b34acffd5a0d1878d13492a4c654112b1d731cc..f7fd53e5cde6be193733c8e39a0a86aa709e1d69 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -634,7 +634,6 @@ struct supertype {
                        *  external:/md0/12
                        */
        int devcnt;
                        *  external:/md0/12
                        */
        int devcnt;

-       char *device_name; /* e.g. /dev/md/whatever */

 
        struct mdinfo *devs;
 
 
        struct mdinfo *devs;
 


@@ -761,6 +760,7 @@ extern int check_raid(int fd, char *name);
 
 extern int get_mdp_major(void);
 extern int dev_open(char *dev, int flags);
 
 extern int get_mdp_major(void);
 extern int dev_open(char *dev, int flags);

+extern int open_dev(int devnum);

 extern int open_dev_excl(int devnum);
 extern int is_standard(char *dev, int *nump);
 extern int same_dev(char *one, char *two);
 extern int open_dev_excl(int devnum);
 extern int is_standard(char *dev, int *nump);
 extern int same_dev(char *one, char *two);

diff --git a/mdmon.c b/mdmon.c
index 5ee83464651983407c6ea261ba60b1f60c66abb9..73c244af91bcbd92a657f250b8f8ba55b3af7b55 100644 (file)
--- a/mdmon.c
+++ b/mdmon.c
@@ -287,6 +287,8 @@ int main(int argc, char *argv[])
        int ignore;
        char *container_name = NULL;
        char *switchroot = NULL;
        int ignore;
        char *container_name = NULL;
        char *switchroot = NULL;

+       int devnum;
+       char *devname;

 
        switch (argc) {
        case 2:
 
        switch (argc) {
        case 2:


@@ -304,7 +306,14 @@ int main(int argc, char *argv[])
                usage();
        }
 
                usage();
        }
 

-       mdfd = open(container_name, O_RDWR);
+       devnum = devname2devnum(container_name);
+       devname = devnum2devname(devnum);
+       if (strcmp(container_name, devname) != 0) {
+               fprintf(stderr, "mdmon: %s is not a valid md device name\n",
+                       container_name);
+               exit(1);
+       }
+       mdfd = open_dev(devnum);

        if (mdfd < 0) {
                fprintf(stderr, "mdmon: %s: %s\n", container_name,
                        strerror(errno));
        if (mdfd < 0) {
                fprintf(stderr, "mdmon: %s: %s\n", container_name,
                        strerror(errno));


@@ -342,9 +351,8 @@ int main(int argc, char *argv[])
                pfd[0] = pfd[1] = -1;
 
        container = malloc(sizeof(*container));
                pfd[0] = pfd[1] = -1;
 
        container = malloc(sizeof(*container));

-       container->devnum = fd2devnum(mdfd);
-       container->devname = devnum2devname(container->devnum);
-       container->device_name = container_name;
+       container->devnum = devnum;
+       container->devname = devname;

        container->arrays = NULL;
 
        if (!container->devname) {
        container->arrays = NULL;
 
        if (!container->devname) {


@@ -462,6 +470,7 @@ int main(int argc, char *argv[])
                        container_name);
                exit(3);
        }
                        container_name);
                exit(3);
        }

+       close(mdfd);

 
        /* Ok, this is close enough.  We can say goodbye to our parent now.
         */
 
        /* Ok, this is close enough.  We can say goodbye to our parent now.
         */

diff --git a/monitor.c b/monitor.c
index 15791f4e93ae79f073621b42ae8147fcb2149e31..5c17910fe535249452cb908ffa39b43f5a950205 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -469,7 +469,7 @@ static int wait_and_act(struct supertype *container, int nowait)
                 * problem as there are no active arrays, there is
                 * nothing that we need to be ready to do.
                 */
                 * problem as there are no active arrays, there is
                 * nothing that we need to be ready to do.
                 */

-               int fd = open(container->device_name, O_RDONLY|O_EXCL);
+               int fd = open_dev_excl(container->devnum);

                if (fd >= 0 || errno != EBUSY) {
                        /* OK, we are safe to leave */
                        if (sigterm && !dirty_arrays)
                if (fd >= 0 || errno != EBUSY) {
                        /* OK, we are safe to leave */
                        if (sigterm && !dirty_arrays)

diff --git a/util.c b/util.c
index b2fbec7a91c7f3f2059c66b6ed0488d156b73ca7..e613a0c8e9fc442d61252184dcab8760de46e046 100644 (file)
--- a/util.c
+++ b/util.c
@@ -813,6 +813,14 @@ int dev_open(char *dev, int flags)
        return fd;
 }
 
        return fd;
 }
 

+int open_dev(int devnum)
+{
+       char buf[20];
+
+       sprintf(buf, "%d:%d", dev2major(devnum), dev2minor(devnum));
+       return dev_open(buf, O_RDWR);
+}
+

 int open_dev_excl(int devnum)
 {
        char buf[20];
 int open_dev_excl(int devnum)
 {
        char buf[20];


@@ -1261,9 +1269,8 @@ int start_mdmon(int devnum)
                for (i=0; paths[i]; i++)
                        if (paths[i][0])
                                execl(paths[i], "mdmon",
                for (i=0; paths[i]; i++)
                        if (paths[i][0])
                                execl(paths[i], "mdmon",

-                                     map_dev(dev2major(devnum),
-                                             dev2minor(devnum),
-                                             1), NULL);
+                                     devnum2devname(devnum),
+                                     NULL);

                exit(1);
        case -1: fprintf(stderr, Name ": cannot run mdmon. "
                         "Array remains readonly\n");
                exit(1);
        case -1: fprintf(stderr, Name ": cannot run mdmon. "
                         "Array remains readonly\n");