diff options
Diffstat (limited to 'Kill.c')
| -rw-r--r-- | Kill.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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) |