|
 |
37f2b0 |
From b938519e7719c992dae2d61c796c45fe49e6b71b Mon Sep 17 00:00:00 2001
|
|
|
37f2b0 |
From: Mateusz Kusiak <mateusz.kusiak@intel.com>
|
|
|
37f2b0 |
Date: Mon, 2 Jan 2023 09:46:22 +0100
|
|
|
37f2b0 |
Subject: [PATCH 78/83] util: remove obsolete code from get_md_name
|
|
|
37f2b0 |
|
|
|
37f2b0 |
get_md_name() is used only with mdstat entries.
|
|
|
37f2b0 |
Remove dead code and simplyfy function.
|
|
|
37f2b0 |
|
|
|
37f2b0 |
Remove redundadnt checks from mdmon.c
|
|
|
37f2b0 |
|
|
|
37f2b0 |
Signed-off-by: Mateusz Kusiak <mateusz.kusiak@intel.com>
|
|
|
37f2b0 |
Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
|
|
|
37f2b0 |
---
|
|
|
37f2b0 |
mdmon.c | 8 +++-----
|
|
|
37f2b0 |
util.c | 51 +++++++++++++++++----------------------------------
|
|
|
37f2b0 |
2 files changed, 20 insertions(+), 39 deletions(-)
|
|
|
37f2b0 |
|
|
|
37f2b0 |
diff --git a/mdmon.c b/mdmon.c
|
|
|
37f2b0 |
index ecf52dc8..60ba3182 100644
|
|
|
37f2b0 |
--- a/mdmon.c
|
|
|
37f2b0 |
+++ b/mdmon.c
|
|
|
37f2b0 |
@@ -366,7 +366,7 @@ int main(int argc, char *argv[])
|
|
|
37f2b0 |
if (argv[optind]) {
|
|
|
37f2b0 |
container_name = get_md_name(argv[optind]);
|
|
|
37f2b0 |
if (!container_name)
|
|
|
37f2b0 |
- container_name = argv[optind];
|
|
|
37f2b0 |
+ return 1;
|
|
|
37f2b0 |
}
|
|
|
37f2b0 |
}
|
|
|
37f2b0 |
|
|
|
37f2b0 |
@@ -403,11 +403,9 @@ int main(int argc, char *argv[])
|
|
|
37f2b0 |
|
|
|
37f2b0 |
return status;
|
|
|
37f2b0 |
} else {
|
|
|
37f2b0 |
- int mdfd = open_mddev(container_name, 1);
|
|
|
37f2b0 |
-
|
|
|
37f2b0 |
- if (mdfd < 0)
|
|
|
37f2b0 |
- return 1;
|
|
|
37f2b0 |
+ int mdfd = open_mddev(container_name, 0);
|
|
|
37f2b0 |
devnm = fd2devnm(mdfd);
|
|
|
37f2b0 |
+
|
|
|
37f2b0 |
close(mdfd);
|
|
|
37f2b0 |
}
|
|
|
37f2b0 |
|
|
|
37f2b0 |
diff --git a/util.c b/util.c
|
|
|
37f2b0 |
index 26ffdcea..9cd89fa4 100644
|
|
|
37f2b0 |
--- a/util.c
|
|
|
37f2b0 |
+++ b/util.c
|
|
|
37f2b0 |
@@ -968,47 +968,30 @@ dev_t devnm2devid(char *devnm)
|
|
|
37f2b0 |
return 0;
|
|
|
37f2b0 |
}
|
|
|
37f2b0 |
|
|
|
37f2b0 |
+/**
|
|
|
37f2b0 |
+ * get_md_name() - Get main dev node of the md device.
|
|
|
37f2b0 |
+ * @devnm: Md device name or path.
|
|
|
37f2b0 |
+ *
|
|
|
37f2b0 |
+ * Function checks if the full name was passed and returns md name
|
|
|
37f2b0 |
+ * if it is the MD device.
|
|
|
37f2b0 |
+ *
|
|
|
37f2b0 |
+ * Return: Main dev node of the md device or NULL if not found.
|
|
|
37f2b0 |
+ */
|
|
|
37f2b0 |
char *get_md_name(char *devnm)
|
|
|
37f2b0 |
{
|
|
|
37f2b0 |
- /* find /dev/md%d or /dev/md/%d or make a device /dev/.tmp.md%d */
|
|
|
37f2b0 |
- /* if dev < 0, want /dev/md/d%d or find mdp in /proc/devices ... */
|
|
|
37f2b0 |
-
|
|
|
37f2b0 |
- static char devname[50];
|
|
|
37f2b0 |
+ static char devname[NAME_MAX];
|
|
|
37f2b0 |
struct stat stb;
|
|
|
37f2b0 |
- dev_t rdev = devnm2devid(devnm);
|
|
|
37f2b0 |
- char *dn;
|
|
|
37f2b0 |
|
|
|
37f2b0 |
- if (rdev == 0)
|
|
|
37f2b0 |
- return 0;
|
|
|
37f2b0 |
- if (strncmp(devnm, "md_", 3) == 0) {
|
|
|
37f2b0 |
- snprintf(devname, sizeof(devname), "/dev/md/%s",
|
|
|
37f2b0 |
- devnm + 3);
|
|
|
37f2b0 |
- if (stat(devname, &stb) == 0 &&
|
|
|
37f2b0 |
- (S_IFMT&stb.st_mode) == S_IFBLK && (stb.st_rdev == rdev))
|
|
|
37f2b0 |
- return devname;
|
|
|
37f2b0 |
- }
|
|
|
37f2b0 |
- snprintf(devname, sizeof(devname), "/dev/%s", devnm);
|
|
|
37f2b0 |
- if (stat(devname, &stb) == 0 && (S_IFMT&stb.st_mode) == S_IFBLK &&
|
|
|
37f2b0 |
- (stb.st_rdev == rdev))
|
|
|
37f2b0 |
- return devname;
|
|
|
37f2b0 |
+ if (strncmp(devnm, "/dev/", 5) == 0)
|
|
|
37f2b0 |
+ snprintf(devname, sizeof(devname), "%s", devnm);
|
|
|
37f2b0 |
+ else
|
|
|
37f2b0 |
+ snprintf(devname, sizeof(devname), "/dev/%s", devnm);
|
|
|
37f2b0 |
|
|
|
37f2b0 |
- snprintf(devname, sizeof(devname), "/dev/md/%s", devnm+2);
|
|
|
37f2b0 |
- if (stat(devname, &stb) == 0 && (S_IFMT&stb.st_mode) == S_IFBLK &&
|
|
|
37f2b0 |
- (stb.st_rdev == rdev))
|
|
|
37f2b0 |
+ if (!is_mddev(devname))
|
|
|
37f2b0 |
+ return NULL;
|
|
|
37f2b0 |
+ if (stat(devname, &stb) == 0 && (S_IFMT&stb.st_mode) == S_IFBLK)
|
|
|
37f2b0 |
return devname;
|
|
|
37f2b0 |
|
|
|
37f2b0 |
- dn = map_dev(major(rdev), minor(rdev), 0);
|
|
|
37f2b0 |
- if (dn)
|
|
|
37f2b0 |
- return dn;
|
|
|
37f2b0 |
- snprintf(devname, sizeof(devname), "/dev/.tmp.%s", devnm);
|
|
|
37f2b0 |
- if (mknod(devname, S_IFBLK | 0600, rdev) == -1)
|
|
|
37f2b0 |
- if (errno != EEXIST)
|
|
|
37f2b0 |
- return NULL;
|
|
|
37f2b0 |
-
|
|
|
37f2b0 |
- if (stat(devname, &stb) == 0 && (S_IFMT&stb.st_mode) == S_IFBLK &&
|
|
|
37f2b0 |
- (stb.st_rdev == rdev))
|
|
|
37f2b0 |
- return devname;
|
|
|
37f2b0 |
- unlink(devname);
|
|
|
37f2b0 |
return NULL;
|
|
|
37f2b0 |
}
|
|
|
37f2b0 |
|
|
|
37f2b0 |
--
|
|
|
37f2b0 |
2.38.1
|
|
|
37f2b0 |
|