cleanup an unused call to container2devname

[thirdparty/mdadm.git] / mdopen.c

diff --git a/mdopen.c b/mdopen.c
index fe983708d7d95a3a910b360054b1a8442b83903c..eee1eea15f049c734e47cb09c0fd524da5f94373 100644 (file)
--- a/mdopen.c
+++ b/mdopen.c
@@ -173,7 +173,7 @@ int open_mddev(char *dev, int autof)
                        must_remove = 1;
                if (stb.st_mode && !must_remove) {
                        /* looks ok, see if it is available */
-                       mdfd = open(dev, O_RDWR, 0);
+                       mdfd = open(dev, O_RDWR);
                        if (mdfd < 0) {
                                fprintf(stderr, Name ": error opening %s: %s\n",
                                        dev, strerror(errno));
@@ -254,7 +254,7 @@ int open_mddev(char *dev, int autof)
                                make_parts(dev,parts, ci->symlinks);
                }
        }
-       mdfd = open(dev, O_RDWR, 0);
+       mdfd = open(dev, O_RDWR);
        if (mdfd < 0)
                fprintf(stderr, Name ": error opening %s: %s\n",
                        dev, strerror(errno));
@@ -268,7 +268,8 @@ int open_mddev(char *dev, int autof)
 }
 
 
-int open_mddev_devnum(char *devname, int devnum, char *name, char *chosen_name)
+int open_mddev_devnum(char *devname, int devnum, char *name,
+                     char *chosen_name, int parts)
 {
        /* Open the md device with number 'devnum', possibly using 'devname',
         * possibly constructing a name with 'name', but in any case, copying
@@ -277,10 +278,11 @@ int open_mddev_devnum(char *devname, int devnum, char *name, char *chosen_name)
        int major_num, minor_num;
        struct stat stb;
        int i;
+       struct createinfo *ci = conf_get_create_info();
 
        if (devname)
                strcpy(chosen_name, devname);
-       else if (name && strchr(name,'/') == NULL) {
+       else if (name && *name && name[0] && strchr(name,'/') == NULL) {
                char *n = strchr(name, ':');
                if (n) n++; else n = name;
                if (isdigit(*n) && devnum < 0)
@@ -312,7 +314,6 @@ int open_mddev_devnum(char *devname, int devnum, char *name, char *chosen_name)
                 * in /dev/md/, we make sure the directory exists.
                 */
                if (strncmp(chosen_name, "/dev/md/", 8) == 0) {
-                       struct createinfo *ci = conf_get_create_info();
                        if (mkdir("/dev/md",0700)==0) {
                                if (chown("/dev/md", ci->uid, ci->gid))
                                        perror("chown /dev/md");
@@ -336,8 +337,11 @@ int open_mddev_devnum(char *devname, int devnum, char *name, char *chosen_name)
                int fd;
 
                fd = open(chosen_name, O_RDWR|O_EXCL);
-               if (fd >= 0 || errno != EBUSY)
+               if (fd >= 0 || errno != EBUSY) {
+                       if (devnum < 0)
+                               make_parts(chosen_name, parts, ci->symlinks);
                        return fd;
+               }
                usleep(200000);
        }
        return -1;