From owner-svn-src-all@FreeBSD.ORG  Sat Nov 27 00:23:55 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E4FA9106564A;
	Sat, 27 Nov 2010 00:23:55 +0000 (UTC)
	(envelope-from mjacob@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D294D8FC13;
	Sat, 27 Nov 2010 00:23:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAR0NthI000544;
	Sat, 27 Nov 2010 00:23:55 GMT (envelope-from mjacob@svn.freebsd.org)
Received: (from mjacob@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAR0NtVe000542;
	Sat, 27 Nov 2010 00:23:55 GMT (envelope-from mjacob@svn.freebsd.org)
Message-Id: <201011270023.oAR0NtVe000542@svn.freebsd.org>
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Sat, 27 Nov 2010 00:23:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215916 - stable/8/sbin/geom/class/multipath
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Nov 2010 00:23:56 -0000

Author: mjacob
Date: Sat Nov 27 00:23:55 2010
New Revision: 215916
URL: http://svn.freebsd.org/changeset/base/215916

Log:
  MFC of 209704.
  
  Fix the clear function which has been broken for a bit.

Modified:
  stable/8/sbin/geom/class/multipath/geom_multipath.c
Directory Properties:
  stable/8/sbin/geom/class/multipath/   (props changed)

Modified: stable/8/sbin/geom/class/multipath/geom_multipath.c
==============================================================================
--- stable/8/sbin/geom/class/multipath/geom_multipath.c	Sat Nov 27 00:04:29 2010	(r215915)
+++ stable/8/sbin/geom/class/multipath/geom_multipath.c	Sat Nov 27 00:23:55 2010	(r215916)
@@ -222,17 +222,28 @@ mp_label(struct gctl_req *req)
 	}
 }
 
+
 static void
 mp_clear(struct gctl_req *req)
 {
 	const char *name;
-	int error;
+	int error, i, nargs;
+
+	nargs = gctl_get_int(req, "nargs");
+	if (nargs < 1) {
+		gctl_error(req, "Too few arguments.");
+		return;
+	}
 
-	name = gctl_get_ascii(req, "arg1");
-	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.");
+	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;
+		}
 	}
 }