Introduce pr_err for printing error messages.

[thirdparty/mdadm.git] / mdopen.c

diff --git a/mdopen.c b/mdopen.c
index d322cf42ad515327800290b2c6c1787d243212c2..5a096aaa6db4e00afb0d32d622a1879048a2ab9a 100644 (file)
--- a/mdopen.c
+++ b/mdopen.c
@@ -38,12 +38,12 @@ void make_parts(char *dev, int cnt)
         * else that of dev
         */
        struct stat stb;
-       int major_num = major_num; /* quiet gcc -Os unitialized warning */
-       int minor_num = minor_num; /* quiet gcc -Os unitialized warning */
-       int odig = odig; /* quiet gcc -Os unitialized warning */
+       int major_num;
+       int minor_num;
+       int odig;
        int i;
        int nlen = strlen(dev) + 20;
-       char *name = malloc(nlen);
+       char *name;
        int dig = isdigit(dev[strlen(dev)-1]);
        char orig[1024];
        char sym[1024];
@@ -52,22 +52,27 @@ void make_parts(char *dev, int cnt)
        if (cnt==0) cnt=4;
        if (lstat(dev, &stb)!= 0)
                return;
-       if (S_ISLNK(stb.st_mode)) {
+
+       if (S_ISBLK(stb.st_mode)) {
+               major_num = major(stb.st_rdev);
+               minor_num = minor(stb.st_rdev);
+               odig = -1;
+       } else if (S_ISLNK(stb.st_mode)) {
                int len = readlink(dev, orig, sizeof(orig));
                if (len < 0 || len > 1000)
                        return;
                orig[len] = 0;
                odig = isdigit(orig[len-1]);
-       } else if (S_ISBLK(stb.st_mode)) {
-               major_num = major(stb.st_rdev);
-               minor_num = minor(stb.st_rdev);
+               major_num = -1;
+               minor_num = -1;
        } else
-                  return;
+               return;
+       name = malloc(nlen);
        for (i=1; i <= cnt ; i++) {
                struct stat stb2;
                snprintf(name, nlen, "%s%s%d", dev, dig?"p":"", i);
                if (stat(name, &stb2)==0) {
-                       if (!S_ISBLK(stb2.st_mode))
+                       if (!S_ISBLK(stb2.st_mode) || !S_ISBLK(stb.st_mode))
                                continue;
                        if (stb2.st_rdev == makedev(major_num, minor_num+i))
                                continue;
@@ -92,6 +97,7 @@ void make_parts(char *dev, int cnt)
                if (err == 0 && stat(name, &stb2) == 0)
                        add_dev(name, &stb2, 0, NULL);
        }
+       free(name);
 }
 
 
@@ -156,7 +162,6 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
 
 
        if (dev) {
-               
                if (strncmp(dev, "/dev/md/", 8) == 0) {
                        strcpy(cname, dev+8);
                } else if (strncmp(dev, "/dev/", 5) == 0) {
@@ -170,7 +175,7 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
                        /* name *must* be mdXX or md_dXX in this context */
                        if (num < 0 ||
                            (strcmp(cname, "md") != 0 && strcmp(cname, "md_d") != 0)) {
-                               fprintf(stderr, Name ": %s is an invalid name "
+                               pr_err("%s is an invalid name "
                                        "for an md device.  Try /dev/md/%s\n",
                                        dev, dev+5);
                                return -1;
@@ -188,12 +193,12 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
                 * empty.
                 */
                if (strchr(cname, '/') != NULL) {
-                       fprintf(stderr, Name ": %s is an invalid name "
+                       pr_err("%s is an invalid name "
                                "for an md device.\n", dev);
                        return -1;
                }
                if (cname[0] == 0) {
-                       fprintf(stderr, Name ": %s is an invalid name "
+                       pr_err("%s is an invalid name "
                                "for an md device (empty!).", dev);
                        return -1;
                }
@@ -220,7 +225,7 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
        if (name && name[0] == 0)
                name = NULL;
        if (name && trustworthy == METADATA && use_mdp == 1) {
-               fprintf(stderr, Name ": %s is not allowed for a %s container. "
+               pr_err("%s is not allowed for a %s container. "
                        "Consider /dev/md%d.\n", dev, name, num);
                return -1;
        }
@@ -255,13 +260,13 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
                /* need to choose a free number. */
                num = find_free_devnum(use_mdp);
                if (num == NoMdDev) {
-                       fprintf(stderr, Name ": No avail md devices - aborting\n");
+                       pr_err("No avail md devices - aborting\n");
                        return -1;
                }
        } else {
                num = use_mdp ? (-1-num) : num;
                if (mddev_busy(num)) {
-                       fprintf(stderr, Name ": %s is already in use.\n",
+                       pr_err("%s is already in use.\n",
                                dev);
                        return -1;
                }
@@ -307,7 +312,7 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
                }
        }
 
-       if (dev)
+       if (dev && dev[0] == '/')
                strcpy(chosen, dev);
        else if (cname[0] == 0)
                strcpy(chosen, devname);
@@ -316,21 +321,21 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
         * If we cannot detect udev, we need to make
         * devices and links ourselves.
         */
-       if (stat("/dev/.udev", &stb) != 0 ||
+       if ((stat("/dev/.udev", &stb) != 0 && stat("/run/udev", &stb) != 0) ||
            check_env("MDADM_NO_UDEV")) {
                /* Make sure 'devname' exists and 'chosen' is a symlink to it */
                if (lstat(devname, &stb) == 0) {
                        /* Must be the correct device, else error */
                        if ((stb.st_mode&S_IFMT) != S_IFBLK ||
                            stb.st_rdev != makedev(dev2major(num),dev2minor(num))) {
-                               fprintf(stderr, Name ": %s exists but looks wrong, please fix\n",
+                               pr_err("%s exists but looks wrong, please fix\n",
                                        devname);
                                return -1;
                        }
                } else {
                        if (mknod(devname, S_IFBLK|0600,
                                  makedev(dev2major(num),dev2minor(num))) != 0) {
-                               fprintf(stderr, Name ": failed to create %s\n",
+                               pr_err("failed to create %s\n",
                                        devname);
                                return -1;
                        }
@@ -358,15 +363,19 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
 
                        if (lstat(chosen, &stb) == 0) {
                                char buf[300];
+                               ssize_t link_len = readlink(chosen, buf, sizeof(buf)-1);
+                               if (link_len >= 0)
+                                       buf[link_len] = '\0';
+
                                if ((stb.st_mode & S_IFMT) != S_IFLNK ||
-                                   readlink(chosen, buf, 300) <0 ||
+                                   link_len < 0 ||
                                    strcmp(buf, devname) != 0) {
-                                       fprintf(stderr, Name ": %s exists - ignoring\n",
+                                       pr_err("%s exists - ignoring\n",
                                                chosen);
                                        strcpy(chosen, devname);
                                }
                        } else if (symlink(devname, chosen) != 0)
-                               fprintf(stderr, Name ": failed to create %s: %s\n",
+                               pr_err("failed to create %s: %s\n",
                                        chosen, strerror(errno));
                        if (use_mdp && strcmp(chosen, devname) != 0)
                                make_parts(chosen, parts);
@@ -374,7 +383,7 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
        }
        mdfd = open_dev_excl(num);
        if (mdfd < 0)
-               fprintf(stderr, Name ": unexpected failure opening %s\n",
+               pr_err("unexpected failure opening %s\n",
                        devname);
        return mdfd;
 }
@@ -388,16 +397,18 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
 int open_mddev(char *dev, int report_errors)
 {
        int mdfd = open(dev, O_RDWR);
+       if (mdfd < 0 && errno == EACCES)
+               mdfd = open(dev, O_RDONLY);
        if (mdfd < 0) {
                if (report_errors)
-                       fprintf(stderr, Name ": error opening %s: %s\n",
+                       pr_err("error opening %s: %s\n",
                                dev, strerror(errno));
                return -1;
        }
        if (md_get_version(mdfd) <= 0) {
                close(mdfd);
                if (report_errors)
-                       fprintf(stderr, Name ": %s does not appear to be "
+                       pr_err("%s does not appear to be "
                                "an md device\n", dev);
                return -2;
        }