]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
mdassemble: Use md_get_array_info() to check for valid array
authorJes Sorensen <Jes.Sorensen@gmail.com>
Wed, 5 Apr 2017 19:46:35 +0000 (15:46 -0400)
committerJes Sorensen <Jes.Sorensen@gmail.com>
Wed, 5 Apr 2017 19:46:35 +0000 (15:46 -0400)
Get rid of another use of md_get_version()

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

index a24b324c9684caad135daa20e2fee145f3ab9dbf..f0833bcf242a3faca70da9ccbe76a64a6a7d97ae 100644 (file)
@@ -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;
        }