remove ANNOUNCE-2.0-devel-?

[thirdparty/mdadm.git] / Kill.c

diff --git a/Kill.c b/Kill.c
index fbda6863a6594c8bacf6aaafd7157767d05975b0..9f05e8bcfcbfa6851e038c052fb187714a64e2d1 100644 (file)
--- a/Kill.c
+++ b/Kill.c
@@ -43,19 +43,28 @@ int Kill(char *dev, int force)
 
        void *super;
        int fd, rv = 0;
+       struct supertype *st;
                
        fd = open(dev, O_RDWR|O_EXCL);
        if (fd < 0) {
                fprintf(stderr, Name ": Couldn't open %s for write - not zeroing\n",
                        dev);
                return 1;
-       } 
-       rv = load_super0(fd, &super, dev);
+       }
+       st = guess_super(fd);
+       if (st == NULL) {
+               fprintf(stderr, Name ": Unrecognised md component device - %s\n", dev);
+               return 1;
+       }
+       rv = st->ss->load_super(st, fd, &super, dev);
        if (force && rv >= 2)
                rv = 0; /* ignore bad data in superblock */
        if (rv== 0 || (force && rv >= 2)) {
-               memset(&super, 0, sizeof(super));
-               if (store_super0(fd, super)) {
+               mdu_array_info_t info;
+               info.major_version = -1; /* zero superblock */
+               free(super);
+               st->ss->init_super(st, &super, &info, "");
+               if (st->ss->store_super(st, fd, super)) {
                        fprintf(stderr, Name ": Could not zero superblock on %s\n",
                                dev);
                        rv = 1;