From owner-p4-projects@FreeBSD.ORG  Mon Aug 15 04:16:40 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 EFD5316A421; Mon, 15 Aug 2005 04:16:39 +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 B395816A41F
	for <perforce@freebsd.org>; Mon, 15 Aug 2005 04:16:39 +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 57E4F43D46
	for <perforce@freebsd.org>; Mon, 15 Aug 2005 04:16:39 +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 j7F4Gd8F010391
	for <perforce@freebsd.org>; Mon, 15 Aug 2005 04:16:39 GMT
	(envelope-from soc-cjones@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7F4GdPs010388
	for perforce@freebsd.org; Mon, 15 Aug 2005 04:16:39 GMT
	(envelope-from soc-cjones@freebsd.org)
Date: Mon, 15 Aug 2005 04:16:39 GMT
Message-Id: <200508150416.j7F4GdPs010388@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 82007 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:16:40 -0000

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

Change 82007 by soc-cjones@soc-cjones_ishtar on 2005/08/15 04:16:30

	Some more RELENG_5_4 v. RELENG_5 stuff.

Affected files ...

.. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum.c#4 edit

Differences ...

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

@@ -57,7 +57,7 @@
 	struct g_geom *gp;
 	struct gv_softc *sc;
 	int error;
-
+	
 	g_topology_assert();
 
 	KASSERT(cp != NULL, ("gv_orphan: null cp"));
@@ -136,6 +136,10 @@
 	g_trace(G_T_TOPOLOGY, "gv_taste(%s, %s)", mp->name, pp->name);
 	g_topology_assert();
 
+	/* XXX: This was in RELENG_5_4, but is not in RELENG_5. */
+	if (pp->sectorsize == 0)
+		return (NULL);
+
 	/* Check if we already have a VINUM geom, or create a new one. */
 	if (LIST_EMPTY(&mp->geom)) { 
 		gp = g_new_geomf(mp, "VINUM");
@@ -156,6 +160,7 @@
 		gp = LIST_FIRST(&mp->geom);
 		sc = gp->softc;
 	}
+	
 
 	/* We need a temporary consumer to read the config from. */
 	cp = g_new_consumer(gp);
@@ -442,10 +447,8 @@
 		LIST_INSERT_HEAD(&sc->subdisks, s, sd);
 	}
 
-	LIST_FOREACH(s, &sc->subdisks, sd) {
+	LIST_FOREACH(s, &sc->subdisks, sd)
 		gv_update_sd_state(s);
-		printf("gv_create: LIST_FOREACH subdisk '%s', size %ld, drive '%s', avail %lld\n", s->name, (long) s->size, d->name, (long long) d->avail);
-	}
 	LIST_FOREACH(p, &sc->plexes, plex)
 		gv_update_plex_config(p);
 	LIST_FOREACH(v, &sc->volumes, volume)