From owner-p4-projects@FreeBSD.ORG  Mon Aug 15 03:37:49 2005
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 0031B16A421; Mon, 15 Aug 2005 03:37:48 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CB2AB16A41F
	for <perforce@freebsd.org>; Mon, 15 Aug 2005 03:37:48 +0000 (GMT)
	(envelope-from soc-cjones@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9AAE143D46
	for <perforce@freebsd.org>; Mon, 15 Aug 2005 03:37:48 +0000 (GMT)
	(envelope-from soc-cjones@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7F3bm7i009008
	for <perforce@freebsd.org>; Mon, 15 Aug 2005 03:37:48 GMT
	(envelope-from soc-cjones@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7F3bmCY009005
	for perforce@freebsd.org; Mon, 15 Aug 2005 03:37:48 GMT
	(envelope-from soc-cjones@freebsd.org)
Date: Mon, 15 Aug 2005 03:37:48 GMT
Message-Id: <200508150337.j7F3bmCY009005@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-cjones@freebsd.org using -f
From: soc-cjones <soc-cjones@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 82004 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, 15 Aug 2005 03:37:49 -0000

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

Change 82004 by soc-cjones@soc-cjones_ishtar on 2005/08/15 03:36:59

	Now we can use gv_rm_sd to kill the old sds without causing a kernel panic.  Yay!

Affected files ...

.. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_rm.c#3 edit

Differences ...

==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_rm.c#3 (text+ko) ====

@@ -257,7 +257,8 @@
 	pp = s->provider;
 
 	/* Clean up. */
-	LIST_REMOVE(s, in_plex);
+	if (strlen(s->plex)) /* XXX: otherwise dies if we're not in a plex. */
+		LIST_REMOVE(s, in_plex);
 	LIST_REMOVE(s, from_drive);
 	LIST_REMOVE(s, sd);
 	gv_free_sd(s);