From owner-p4-projects@FreeBSD.ORG  Mon Aug 15 04:11:33 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 18EC716A421; Mon, 15 Aug 2005 04:11:33 +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 E7B9516A41F
	for <perforce@freebsd.org>; Mon, 15 Aug 2005 04:11:32 +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 B571E43D46
	for <perforce@freebsd.org>; Mon, 15 Aug 2005 04:11:32 +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 j7F4BWgC010159
	for <perforce@freebsd.org>; Mon, 15 Aug 2005 04:11:32 GMT
	(envelope-from soc-cjones@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7F4BWUD010156
	for perforce@freebsd.org; Mon, 15 Aug 2005 04:11:32 GMT
	(envelope-from soc-cjones@freebsd.org)
Date: Mon, 15 Aug 2005 04:11:32 GMT
Message-Id: <200508150411.j7F4BWUD010156@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 82006 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 04:11:33 -0000

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

Change 82006 by soc-cjones@soc-cjones_ishtar on 2005/08/15 04:11:01

	Some stuff in RELENG_5 but not in RELENG_5_4 breaks writing gvinum configs to disk.  Go figure.  Anyways, this fixes that.  Perhaps RELENG_6 unbreaks things better.

Affected files ...

.. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_drive.c#2 edit

Differences ...

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

@@ -113,8 +113,9 @@
 	KASSERT(d != NULL, ("gv_save_config: null d"));
 	KASSERT(sc != NULL, ("gv_save_config: null sc"));
 
-	if (d->state != GV_DRIVE_UP)
-		return;
+	/* XXX: This is in RELENG_5, but was not in RELENG_5_4. */
+	/* if (d->state != GV_DRIVE_UP)
+	   	return; */
 
 	if (cp == NULL) {
 		gp = d->geom;
@@ -146,7 +147,8 @@
 		printf("GEOM_VINUM: g_access failed on drive %s, errno %d\n",
 		    d->name, error);
 		sbuf_delete(sb);
-		g_free(vhdr);
+		/* XXX: this was in RELENG_5, but not RELENG_5_4 */
+		/* g_free(vhdr); */
 		return;
 	}
 	g_topology_unlock();
@@ -200,8 +202,9 @@
 		return (0);
 
 	d = gp->softc;
-	if (d == NULL)
-		return (0);
+	/* XXX: this was in RELENG_5, but not RELENG_5_4. */
+	/* if (d == NULL)
+		return (0); */
 
 	s = pp->private;
 	KASSERT(s != NULL, ("gv_drive_access: NULL s"));