X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Kill.c;h=ba99c6e529f423ff6a0d62c5fa94b73e73bc5e39;hb=82d9eba687c952a9919f756203706285d6c42f07;hp=b20c28e0ed6c86ef1f8cbccfd2a2de9b98afd499;hpb=f9ce90ba509d0b624cc38635861b9c27550fbefc;p=thirdparty%2Fmdadm.git

diff --git a/Kill.c b/Kill.c
index b20c28e0..ba99c6e5 100644
--- a/Kill.c
+++ b/Kill.c
@@ -43,7 +43,7 @@ int Kill(char *dev, int force)
 
 	void *super;
 	int fd, rv = 0;
-	struct superswitch *ss;
+	struct supertype *st;
 		
 	fd = open(dev, O_RDWR|O_EXCL);
 	if (fd < 0) {
@@ -51,20 +51,20 @@ int Kill(char *dev, int force)
 			dev);
 		return 1;
 	}
-	ss = guess_super(fd, dev);
-	if (ss == NULL) {
+	st = guess_super(fd);
+	if (st == NULL) {
 		fprintf(stderr, Name ": Unrecognised md component device - %s\n", dev);
 		return 1;
 	}
-	rv = ss->load_super(fd, &super, dev);
+	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)) {
 		mdu_array_info_t info;
 		info.major_version = -1; /* zero superblock */
 		free(super);
-		ss->init_super(&super, &info);
-		if (ss->store_super(fd, super)) {
+		st->ss->init_super(&super, &info);
+		if (st->ss->store_super(fd, super)) {
 			fprintf(stderr, Name ": Could not zero superblock on %s\n",
 				dev);
 			rv = 1;