From owner-p4-projects@FreeBSD.ORG  Wed Aug  8 09:41:26 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9CD8716A41A; Wed,  8 Aug 2007 09:41:26 +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 51BCE16A418
	for <perforce@FreeBSD.org>; Wed,  8 Aug 2007 09:41:26 +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 3D78F13C4D0
	for <perforce@FreeBSD.org>; Wed,  8 Aug 2007 09:41:26 +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 l789fQxJ026178
	for <perforce@FreeBSD.org>; Wed, 8 Aug 2007 09:41:26 GMT
	(envelope-from lulf@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l789fPoL026174
	for perforce@freebsd.org; Wed, 8 Aug 2007 09:41:25 GMT
	(envelope-from lulf@FreeBSD.org)
Date: Wed, 8 Aug 2007 09:41:25 GMT
Message-Id: <200708080941.l789fPoL026174@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 124887 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: Wed, 08 Aug 2007 09:41:27 -0000

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

Change 124887 by lulf@lulf_carrot on 2007/08/08 09:41:18

	- Remember to remove subdisk from a drives subdisk list when a drive is
	  lost.

Affected files ...

.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_events.c#11 edit

Differences ...

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

@@ -157,7 +157,7 @@
 {
 	struct g_consumer *cp;
 	struct gv_drive *d2;
-	struct gv_sd *s;
+	struct gv_sd *s, *s2;
 	struct gv_freelist *fl, *fl2;
 
 	gv_set_drive_state(d, GV_DRIVE_DOWN,
@@ -195,8 +195,11 @@
 	d->freelist_entries = 0;
 	d->sdcount = 0;
 
-	LIST_FOREACH(s, &d->subdisks, from_drive)
+	/* Put the subdisk in tasted mode, and remove from drive list. */
+	LIST_FOREACH_SAFE(s, &d->subdisks, from_drive, s2) {
+		LIST_REMOVE(s, from_drive);
 		s->flags |= GV_SD_TASTED;
+	}
 
 	/*
 	 * Don't forget that gv_is_newer wants a "real" drive at the beginning