From owner-p4-projects@FreeBSD.ORG  Mon Jul 23 12:49:56 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1A1D816A524; Mon, 23 Jul 2007 12:49:55 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 809F716A535
	for <perforce@FreeBSD.org>; Mon, 23 Jul 2007 12:49:55 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6ECF913C4B5
	for <perforce@FreeBSD.org>; Mon, 23 Jul 2007 12:49:55 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6NCntEt059891
	for <perforce@FreeBSD.org>; Mon, 23 Jul 2007 12:49:55 GMT
	(envelope-from lulf@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6NCntL5059887
	for perforce@freebsd.org; Mon, 23 Jul 2007 12:49:55 GMT
	(envelope-from lulf@FreeBSD.org)
Date: Mon, 23 Jul 2007 12:49:55 GMT
Message-Id: <200707231249.l6NCntL5059887@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	lulf@FreeBSD.org using -f
From: Ulf Lilleengen <lulf@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 123954 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: Mon, 23 Jul 2007 12:49:56 -0000

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

Change 123954 by lulf@lulf_carrot on 2007/07/23 12:49:40

	- Change resetconfig to remove subdisks before drives, since we now
	  don't completely remove drives.

Affected files ...

.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_rm.c#10 edit

Differences ...

==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_rm.c#10 (text+ko) ====

@@ -168,10 +168,10 @@
 		}
 	}
 	/* Then if not, we remove everything. */
+	LIST_FOREACH_SAFE(s, &sc->subdisks, sd, s2)
+		gv_rm_sd(sc, s);
 	LIST_FOREACH_SAFE(d, &sc->drives, drive, d2)
 		gv_rm_drive(sc, d, 0);
-	LIST_FOREACH_SAFE(s, &sc->subdisks, sd, s2)
-		gv_rm_sd(sc, s);
 	LIST_FOREACH_SAFE(p, &sc->plexes, plex, p2)
 		gv_rm_plex(sc, p);
 	LIST_FOREACH_SAFE(v, &sc->volumes, volume, v2)