open_subarray: pass subarray name as explicit arg.

[thirdparty/mdadm.git] / Kill.c

diff --git a/Kill.c b/Kill.c
index b3344bd287802b95bda2ca381f0f7d7f00efd916..29a43ea6bf20fe10071d43f4f9262a766e197a88 100644 (file)
--- a/Kill.c
+++ b/Kill.c
@@ -53,7 +53,7 @@ int Kill(char *dev, struct supertype *st, int force, int quiet, int noexcl)
        }
        if (st == NULL)
                st = guess_super(fd);
-       if (st == NULL) {
+       if (st == NULL || st->ss->init_super == NULL) {
                if (!quiet)
                        fprintf(stderr, Name ": Unrecognised md component device - %s\n", dev);
                close(fd);
@@ -96,16 +96,7 @@ int Kill_subarray(char *dev, char *subarray, int quiet)
 
        memset(st, 0, sizeof(*st));
 
-       if (snprintf(st->subarray, sizeof(st->subarray), "%s", subarray) >=
-           sizeof(st->subarray)) {
-               if (!quiet)
-                       fprintf(stderr,
-                               Name ": Input overflow for subarray '%s' > %zu bytes\n",
-                               subarray, sizeof(st->subarray) - 1);
-               return 2;
-       }
-
-       fd = open_subarray(dev, st, quiet);
+       fd = open_subarray(dev, subarray, st, quiet);
        if (fd < 0)
                return 2;