Merge branch 'master' in devel-3.0

[thirdparty/mdadm.git] / mdopen.c

diff --git a/mdopen.c b/mdopen.c
index 44efb84068a948c335705bd8f29ebee1a714520a..5d478f5b5fdbcdb74f5572ff11788b6d6c521682 100644 (file)
--- a/mdopen.c
+++ b/mdopen.c
@@ -52,6 +52,7 @@ void make_parts(char *dev, int cnt)
        int dig = isdigit(dev[strlen(dev)-1]);
        char orig[1024];
        char sym[1024];
+       int err;
 
        if (cnt==0) cnt=4;
        if (lstat(dev, &stb)!= 0)
@@ -87,12 +88,14 @@ void make_parts(char *dev, int cnt)
                                perror("chown");
                        if (chmod(name, stb2.st_mode & 07777))
                                perror("chmod");
+                       err = 0;
                } else {
-                       snprintf(sym, 10000, "%s%s%d", orig, odig?"p":"", i);
-                       symlink(sym, name);
+                       snprintf(sym, sizeof(sym), "%s%s%d", orig, odig?"p":"", i);
+                       err = symlink(sym, name);
                }
-               stat(name, &stb2);
-               add_dev(name, &stb2, 0, NULL);
+
+               if (err == 0 && stat(name, &stb2) == 0)
+                       add_dev(name, &stb2, 0, NULL);
        }
 }
 
@@ -235,11 +238,14 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
                        use_mdp = 0;
        }
        if (num < 0 && trustworthy == LOCAL && name) {
-               /* if name is numeric, us that for num */
+               /* if name is numeric, use that for num
+                * if it is not already in use */
                char *ep;
                num = strtoul(name, &ep, 10);
                if (ep == name || *ep)
                        num = -1;
+               else if (mddev_busy(use_mdp ? (-1-num) : num))
+                       num = -1;
        }
 
        if (num < 0) {
@@ -269,19 +275,33 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
                 * reasonable length and remove '/'
                 */
                char *cp;
+               struct map_ent *map = NULL;
+               int conflict = 1;
+               int unum = 0;
+               int cnlen;
                strncpy(cname, name, 200);
                cname[200] = 0;
                while ((cp = strchr(cname, '/')) != NULL)
                        *cp = '-';
-               if (trustworthy == METADATA)
-                       /* always add device number to metadata */
-                       sprintf(cname+strlen(cname), "%d", num);
-               else if (trustworthy == FOREIGN &&
-                        strchr(cname, ':') == NULL)
-                       /* add _%d to FOREIGN array that don't have
-                        * a 'host:' prefix
-                        */
-                       sprintf(cname+strlen(cname), "_%d", num<0?(-1-num):num);
+               if (trustworthy == LOCAL ||
+                   (trustworthy == FOREIGN && strchr(cname, ':') != NULL)) {
+                       /* Only need suffix if there is a conflict */
+                       if (map_by_name(&map, cname) == NULL)
+                               conflict = 0;
+               }
+               cnlen = strlen(cname);
+               while (conflict) {
+                       if (trustworthy == METADATA && !isdigit(cname[cnlen-1]))
+                               sprintf(cname+cnlen, "%d", unum);
+                       else
+                               /* add _%d to FOREIGN array that don't 
+                                * a 'host:' prefix
+                                */
+                               sprintf(cname+cnlen, "_%d", unum);
+                       unum++;
+                       if (map_by_name(&map, cname) == NULL)
+                               conflict = 0;
+               }
        }
        if (cname[0] == 0)
                strcpy(chosen, devname);
@@ -339,8 +359,9 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
                                                chosen);
                                        strcpy(chosen, devname);
                                }
-                       } else
-                               symlink(devname, chosen);
+                       } else if (symlink(devname, chosen) != 0)
+                               fprintf(stderr, Name ": failed to create %s: %s\n",
+                                       chosen, strerror(errno));
                        if (use_mdp && strcmp(chosen, devname) != 0)
                                make_parts(chosen, parts);
                }