From: Jes Sorensen <Jes.Sorensen@gmail.com>
Date: Wed, 5 Apr 2017 19:46:35 +0000 (-0400)
Subject: mdassemble: Use md_get_array_info() to check for valid array
X-Git-Tag: mdadm-4.1-rc1~201
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c9591115d577841522acd245cd2445cb77ee204;p=thirdparty%2Fmdadm.git

mdassemble: Use md_get_array_info() to check for valid array

Get rid of another use of md_get_version()

Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>
---

diff --git a/mdassemble.c b/mdassemble.c
index a24b324c..f0833bcf 100644
--- a/mdassemble.c
+++ b/mdassemble.c
@@ -32,13 +32,12 @@ char const Name[] = "mdassemble";
 /* from mdopen.c */
 int open_mddev(char *dev, int report_errors/*unused*/)
 {
+	struct mdu_array_info_s array;
 	int mdfd = open(dev, O_RDONLY);
 	if (mdfd < 0)
-		pr_err("error opening %s: %s\n",
-			dev, strerror(errno));
-	else if (md_get_version(mdfd) <= 0) {
-		pr_err("%s does not appear to be an md device\n",
-			dev);
+		pr_err("error opening %s: %s\n", dev, strerror(errno));
+	else if (md_get_array_info(mdfd, &array) != 0) {
+		pr_err("%s does not appear to be an md device\n", dev);
 		close(mdfd);
 		mdfd = -1;
 	}