X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=Kill.c;h=f5c30e97ea61f074c4ef5568bc993c2d54a0f2ea;hp=f5c582180ac28d7a8593657f42b02d481aa352be;hb=0f22b998fb9cf8478810b89cd50fa5b4fbf11d38;hpb=0bd54da30eebdd8bd7fd17ea438638e3f7840a1c

diff --git a/Kill.c b/Kill.c
index f5c58218..f5c30e97 100644
--- a/Kill.c
+++ b/Kill.c
@@ -29,32 +29,35 @@
 #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
 	 * Definitely not safe.
+	 * Returns:
+	 *  0 - a zero superblock was successfully written out
+	 *  1 - failed to write the zero superblock
+	 *  2 - failed to open the device or find a superblock.
 	 */
 
 	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",
 				dev);
-		close(fd);
-		return 1;
+		return 2;
 	}
-	st = guess_super(fd);
-	if (st == NULL) {
+	if (st == NULL)
+		st = guess_super(fd);
+	if (st == NULL || st->ss->init_super == 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)
@@ -76,3 +79,81 @@ int Kill(char *dev, int force, int quiet, int noexcl)
 	close(fd);
 	return rv;
 }
+
+int Kill_subarray(char *dev, char *subarray, int quiet)
+{
+	/* Delete a subarray out of a container, the subarry must be
+	 * inactive.  The subarray string must be a subarray index
+	 * number.
+	 *
+	 * 0 = successfully deleted subarray from all container members
+	 * 1 = failed to sync metadata to one or more devices
+	 * 2 = failed to find the container, subarray, or other resource
+	 *     issue
+	 */
+	struct supertype supertype, *st = &supertype;
+	int fd, rv = 2;
+
+	memset(st, 0, sizeof(*st));
+
+	if (snprintf(st->subarray, sizeof(st->subarray), "%s", subarray) >=
+	    (int)sizeof(st->subarray)) {
+		if (!quiet)
+			fprintf(stderr,
+				Name ": Input overflow for subarray '%s' > %zu bytes\n",
+				subarray, sizeof(st->subarray) - 1);
+		return 2;
+	}
+
+	fd = open_subarray(dev, st, quiet);
+	if (fd < 0)
+		return 2;
+
+	if (!st->ss->kill_subarray) {
+		if (!quiet)
+			fprintf(stderr,
+				Name ": Operation not supported for %s metadata\n",
+				st->ss->name);
+		goto free_super;
+	}
+
+	if (is_subarray_active(subarray, st->devname)) {
+		if (!quiet)
+			fprintf(stderr,
+				Name ": Subarray-%s still active, aborting\n",
+				subarray);
+		goto free_super;
+	}
+
+	if (mdmon_running(st->devnum))
+		st->update_tail = &st->updates;
+
+	/* ok we've found our victim, drop the axe */
+	rv = st->ss->kill_subarray(st);
+	if (rv) {
+		if (!quiet)
+			fprintf(stderr,
+				Name ": Failed to delete subarray-%s from %s\n",
+				subarray, dev);
+		goto free_super;
+	}
+
+	/* FIXME these routines do not report success/failure */
+	if (st->update_tail)
+		flush_metadata_updates(st);
+	else
+		st->ss->sync_metadata(st);
+
+	if (!quiet)
+		fprintf(stderr,
+			Name ": Deleted subarray-%s from %s, UUIDs may have changed\n",
+			subarray, dev);
+
+	rv = 0;
+
+ free_super:
+	st->ss->free_super(st);
+	close(fd);
+
+	return rv;
+}