Various fixes for --kill

[thirdparty/mdadm.git] / Kill.c

diff --git a/Kill.c b/Kill.c
index f5c582180ac28d7a8593657f42b02d481aa352be..63442a628313b5dce794455c9a17220c2435b34d 100644 (file)
--- a/Kill.c
+++ b/Kill.c
@@ -29,7 +29,7 @@
 #include       "md_u.h"
 #include       "md_p.h"
 
-int Kill(char *dev, int force, int quiet, int noexcl)
+int Kill(char *dev, struct supertype *st, int force, int quiet, int noexcl)
 {
        /*
         * Nothing fancy about Kill.  It just zeroes out a superblock
@@ -37,11 +37,10 @@ int Kill(char *dev, int force, int quiet, int noexcl)
         */
 
        int fd, rv = 0;
-       struct supertype *st;
 
        if (force)
                noexcl = 1;
-       fd = open(dev, O_RDWR|(force ? 0 : O_EXCL));
+       fd = open(dev, O_RDWR|(noexcl ? 0 : O_EXCL));
        if (fd < 0) {
                if (!quiet)
                        fprintf(stderr, Name ": Couldn't open %s for write - not zeroing\n",
@@ -49,12 +48,13 @@ int Kill(char *dev, int force, int quiet, int noexcl)
                close(fd);
                return 1;
        }
-       st = guess_super(fd);
+       if (st == NULL)
+               st = guess_super(fd);
        if (st == NULL) {
                if (!quiet)
                        fprintf(stderr, Name ": Unrecognised md component device - %s\n", dev);
                close(fd);
-               return 1;
+               return 2;
        }
        rv = st->ss->load_super(st, fd, dev);
        if (force && rv >= 2)