Blame SOURCES/0078-util-remove-obsolete-code-from-get_md_name.patch

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