util: remove obsolete code from get_md_name

get_md_name() is used only with mdstat entries.
Remove dead code and simplyfy function.

Remove redundadnt checks from mdmon.c

Signed-off-by: Mateusz Kusiak <mateusz.kusiak@intel.com>
Signed-off-by: Jes Sorensen <jes@trained-monkey.org>

diff --git a/mdmon.c b/mdmon.c
index ecf52dc854de4736770bf1c4c89c05358989faf7..60ba318253b995ad0a22b9948523d43fa1800b8f 100644 (file)
--- a/mdmon.c
+++ b/mdmon.c
@@ -366,7 +366,7 @@ int main(int argc, char *argv[])
                if (argv[optind]) {
                        container_name = get_md_name(argv[optind]);
                        if (!container_name)
-                               container_name = argv[optind];
+                               return 1;
                }
        }
 
@@ -403,11 +403,9 @@ int main(int argc, char *argv[])
 
                return status;
        } else {
-               int mdfd = open_mddev(container_name, 1);
-
-               if (mdfd < 0)
-                       return 1;
+               int mdfd = open_mddev(container_name, 0);
                devnm = fd2devnm(mdfd);
+
                close(mdfd);
        }
 

diff --git a/util.c b/util.c
index 26ffdceabcdc0fbd3728d3975180452f02286017..9cd89fa416bdd9ff3d7b433b9e78fa64997a6ec1 100644 (file)
--- a/util.c
+++ b/util.c
@@ -968,47 +968,30 @@ dev_t devnm2devid(char *devnm)
        return 0;
 }
 
+/**
+ * get_md_name() - Get main dev node of the md device.
+ * @devnm: Md device name or path.
+ *
+ * Function checks if the full name was passed and returns md name
+ * if it is the MD device.
+ *
+ * Return: Main dev node of the md device or NULL if not found.
+ */
 char *get_md_name(char *devnm)
 {
-       /* find /dev/md%d or /dev/md/%d or make a device /dev/.tmp.md%d */
-       /* if dev < 0, want /dev/md/d%d or find mdp in /proc/devices ... */
-
-       static char devname[50];
+       static char devname[NAME_MAX];
        struct stat stb;
-       dev_t rdev = devnm2devid(devnm);
-       char *dn;
 
-       if (rdev == 0)
-               return 0;
-       if (strncmp(devnm, "md_", 3) == 0) {
-               snprintf(devname, sizeof(devname), "/dev/md/%s",
-                       devnm + 3);
-               if (stat(devname, &stb) == 0 &&
-                   (S_IFMT&stb.st_mode) == S_IFBLK && (stb.st_rdev == rdev))
-                       return devname;
-       }
-       snprintf(devname, sizeof(devname), "/dev/%s", devnm);
-       if (stat(devname, &stb) == 0 && (S_IFMT&stb.st_mode) == S_IFBLK &&
-           (stb.st_rdev == rdev))
-               return devname;
+       if (strncmp(devnm, "/dev/", 5) == 0)
+               snprintf(devname, sizeof(devname), "%s", devnm);
+       else
+               snprintf(devname, sizeof(devname), "/dev/%s", devnm);
 
-       snprintf(devname, sizeof(devname), "/dev/md/%s", devnm+2);
-       if (stat(devname, &stb) == 0 && (S_IFMT&stb.st_mode) == S_IFBLK &&
-           (stb.st_rdev == rdev))
+       if (!is_mddev(devname))
+               return NULL;
+       if (stat(devname, &stb) == 0 && (S_IFMT&stb.st_mode) == S_IFBLK)
                return devname;
 
-       dn = map_dev(major(rdev), minor(rdev), 0);
-       if (dn)
-               return dn;
-       snprintf(devname, sizeof(devname), "/dev/.tmp.%s", devnm);
-       if (mknod(devname, S_IFBLK | 0600, rdev) == -1)
-               if (errno != EEXIST)
-                       return NULL;
-
-       if (stat(devname, &stb) == 0 && (S_IFMT&stb.st_mode) == S_IFBLK &&
-           (stb.st_rdev == rdev))
-               return devname;
-       unlink(devname);
        return NULL;
 }