X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Kill.c;h=ff52561d0cbb988c7e3977b2f939ba2e7670c6f2;hb=5308f11727b889965efe5ac0e854d197c2b51f6d;hp=cc2e589301ee8f201c30e68dcfdac08943e803df;hpb=83cd1e97cbc0c4749561b72864dbaaed3a014123;p=thirdparty%2Fmdadm.git diff --git a/Kill.c b/Kill.c index cc2e5893..ff52561d 100644 --- a/Kill.c +++ b/Kill.c @@ -63,7 +63,7 @@ int Kill(char *dev, struct supertype *st, int force, int verbose, int noexcl) rv = st->ss->load_super(st, fd, dev); if (rv == 0 || (force && rv >= 2)) { st->ss->free_super(st); - st->ss->init_super(st, NULL, 0, "", NULL, NULL, + st->ss->init_super(st, NULL, NULL, "", NULL, NULL, INVALID_SECTORS); if (st->ss->store_super(st, fd)) { if (verbose >= 0) @@ -107,14 +107,14 @@ int Kill_subarray(char *dev, char *subarray, int verbose) goto free_super; } - if (is_subarray_active(subarray, st->devname)) { + if (is_subarray_active(subarray, st->devnm)) { if (verbose >= 0) pr_err("Subarray-%s still active, aborting\n", subarray); goto free_super; } - if (mdmon_running(st->devnum)) + if (mdmon_running(st->devnm)) st->update_tail = &st->updates; /* ok we've found our victim, drop the axe */