From owner-p4-projects@FreeBSD.ORG  Fri Jan  5 22:46:05 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 311FA16A412; Fri,  5 Jan 2007 22:46:05 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id EB17016A407
	for <perforce@freebsd.org>; Fri,  5 Jan 2007 22:46:04 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id DF26F13C461
	for <perforce@freebsd.org>; Fri,  5 Jan 2007 22:46:04 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l05Mk4gQ055373
	for <perforce@freebsd.org>; Fri, 5 Jan 2007 22:46:04 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l05Mk4D5055370
	for perforce@freebsd.org; Fri, 5 Jan 2007 22:46:04 GMT
	(envelope-from mjacob@freebsd.org)
Date: Fri, 5 Jan 2007 22:46:04 GMT
Message-Id: <200701052246.l05Mk4D5055370@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 112567 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jan 2007 22:46:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=112567

Change 112567 by mjacob@mjexp_6 on 2007/01/05 22:45:21

	Fix a typo.

Affected files ...

.. //depot/projects/mjexp_6/sbin/geom/class/multipath/geom_multipath.c#2 edit

Differences ...

==== //depot/projects/mjexp_6/sbin/geom/class/multipath/geom_multipath.c#2 (text+ko) ====

@@ -47,16 +47,17 @@
 
 static void mp_main(struct gctl_req *, unsigned int);
 static void mp_label(struct gctl_req *);
+static void mp_clear(struct gctl_req *);
 
 struct g_command class_commands[] = {
 	{
 		"label", G_FLAG_VERBOSE | G_FLAG_LOADKLD, mp_main, G_NULL_OPTS,
-		"[-v] name prov prov"
+		"[-v] name prov ..."
 	},
 	{
-		"destroy", G_FLAG_VERBOSE, NULL, G_NULL_OPTS,
-		"[-fv] name"
-        },
+		"clear", G_FLAG_VERBOSE, mp_main, G_NULL_OPTS,
+		"[-v] prov ..."
+	},
 	G_CMD_SENTINEL
 };
 
@@ -72,6 +73,8 @@
 	}
 	if (strcmp(name, "label") == 0) {
 		mp_label(req);
+	} else if (strcmp(name, "clear") == 0) {
+		mp_clear(req);
 	} else {
 		gctl_error(req, "Unknown command: %s.", name);
 	}
@@ -90,7 +93,7 @@
 	int error, i, nargs;
 
 	nargs = gctl_get_int(req, "nargs");
-	if (nargs != 3) {
+	if (nargs < 2) {
 		gctl_error(req, "wrong number of arguments.");
 		return;
 	}
@@ -201,3 +204,27 @@
 		}
 	}
 }
+
+static void
+mp_clear(struct gctl_req *req)
+{
+	const char *name;
+	int error, i, nargs;
+
+	nargs = gctl_get_int(req, "nargs");
+	if (nargs < 1) {
+		gctl_error(req, "Too few arguments.");
+		return;
+	}
+
+        for (i = 0; i < nargs; i++) {
+		name = gctl_get_ascii(req, "arg%d", i);
+                error = g_metadata_clear(name, G_MULTIPATH_MAGIC);
+		if (error != 0) {
+			fprintf(stderr, "Can't clear metadata on %s: %s.\n",
+			    name, strerror(error));
+			gctl_error(req, "Not fully done.");
+			continue;
+                }
+        }
+}