fix: segfault when killing subarray of non-existent container

[thirdparty/mdadm.git] / mdassemble.c

diff --git a/mdassemble.c b/mdassemble.c
index cf83795789158a28e41f441dac40dd060f067681..66e480a82f71f9fc6e1b64fe87dc1aad58de680c 100644 (file)
--- a/mdassemble.c
+++ b/mdassemble.c
@@ -26,28 +26,6 @@
 #include "mdadm.h"
 #include "md_p.h"
 
-/* from readme.c */
-mapping_t pers[] = {
-       { "linear", -1},
-       { "raid0", 0},
-       { "0", 0},
-       { "stripe", 0},
-       { "raid1", 1},
-       { "1", 1},
-       { "mirror", 1},
-       { "raid4", 4},
-       { "4", 4},
-       { "raid5", 5},
-       { "5", 5},
-       { "multipath", -4},
-       { "mp", -4},
-       { "raid6", 6},
-       { "6", 6},
-       { "raid10", 10},
-       { "10", 10},
-       { NULL, 0}
-};
-
 #ifndef MDASSEMBLE_AUTO
 /* from mdopen.c */
 int open_mddev(char *dev, int report_errors/*unused*/)
@@ -88,7 +66,7 @@ int verbose = 0;
 int force = 0;
 
 int main(int argc, char *argv[]) {
-       mddev_ident_t array_list =  conf_get_ident(NULL);
+       struct mddev_ident *array_list =  conf_get_ident(NULL);
        if (!array_list) {
                fprintf(stderr, Name ": No arrays found in config file\n");
                rv = 1;
@@ -105,7 +83,7 @@ int main(int argc, char *argv[]) {
                        if (mdfd >= 0)
                                close(mdfd);
                        rv |= Assemble(array_list->st, array_list->devname,
-                                      array_list, NULL, NULL,
+                                      array_list, NULL, NULL, 0,
                                       readonly, runstop, NULL, NULL, 0,
                                       verbose, force);
                }