From owner-p4-projects@FreeBSD.ORG  Sun Jan  7 05:34:53 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 E6AAD16A40F; Sun,  7 Jan 2007 05:34:52 +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 A3F1E16A403
	for <perforce@freebsd.org>; Sun,  7 Jan 2007 05:34:52 +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 957A013C455
	for <perforce@freebsd.org>; Sun,  7 Jan 2007 05:34:52 +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 l075Yq2K084468
	for <perforce@freebsd.org>; Sun, 7 Jan 2007 05:34:52 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l075YqDb084465
	for perforce@freebsd.org; Sun, 7 Jan 2007 05:34:52 GMT
	(envelope-from mjacob@freebsd.org)
Date: Sun, 7 Jan 2007 05:34:52 GMT
Message-Id: <200701070534.l075YqDb084465@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 112633 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: Sun, 07 Jan 2007 05:34:53 -0000

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

Change 112633 by mjacob@mjexp on 2007/01/07 05:34:22

	Make sure we don't add the same disk twice. Note when
	we destroy a multipath geom.

Affected files ...

.. //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#12 edit

Differences ...

==== //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#12 (text+ko) ====

@@ -291,6 +291,19 @@
 	sc = gp->softc;
 	KASSERT(sc, ("no softc"));
 
+	/*
+	 * Make sure that the passed provider isn't already attached
+	 */
+	LIST_FOREACH(cp, &gp->consumer, consumer) {
+		if (cp->provider == pp) {
+			break;
+		}
+	}
+	if (cp) {
+		printf("GEOM_MULTIPATH: provider %s already attached to %s\n",
+		    pp->name, gp->name);
+		return (EEXIST);
+	}
 	nxtcp = LIST_FIRST(&gp->consumer);
 	cp = g_new_consumer(gp);
 	if (cp == NULL) {
@@ -342,6 +355,7 @@
 	if (pp != NULL && (pp->acr != 0 || pp->acw != 0 || pp->ace != 0)) {
 		return (EBUSY);
 	}
+	printf("GEOM_MULTIPATH: destroying %s\n", gp->name);
 	g_free(gp->softc);
 	gp->softc = NULL;
 	g_wither_geom(gp, ENXIO);