From owner-p4-projects  Sat Feb  8 19:20:30 2003
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1AA8C37B405; Sat,  8 Feb 2003 19:20:27 -0800 (PST)
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 BAB2C37B401
	for <perforce@freebsd.org>; Sat,  8 Feb 2003 19:20:26 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6696D43F85
	for <perforce@freebsd.org>; Sat,  8 Feb 2003 19:20:26 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h193KQbv012962
	for <perforce@freebsd.org>; Sat, 8 Feb 2003 19:20:26 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h193KQno012954
	for perforce@freebsd.org; Sat, 8 Feb 2003 19:20:26 -0800 (PST)
Date: Sat, 8 Feb 2003 19:20:26 -0800 (PST)
Message-Id: <200302090320.h193KQno012954@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
Subject: PERFORCE change 24867 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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

Change 24867 by jmallett@jmallett_dalek on 2003/02/08 19:20:15

	Add a missing GEOM topology lock.  Add some bootverbose tomfoolery
	for printing the slices added, and their types, also include a table
	of strings representing the different partition types, using the same
	text as NetBSD for consistency.

Affected files ...

.. //depot/projects/mips/sys/geom/geom_fx.c#3 edit

Differences ...

==== //depot/projects/mips/sys/geom/geom_fx.c#3 (text+ko) ====

@@ -61,6 +61,23 @@
 #define	FX_LABEL_MAGIC	0xbe5a941
 #define	FX_NPARTS	16
 
+static const char *fx_typename[] = {
+	"Volume Header",
+	"Repl Trks",
+	"Repl Secs",
+	"Raw",
+	"4.2BSD",
+	"SysV",
+	"Volume",
+	"EFS",
+	"LVol",
+	"RLVol",
+	"XFS",
+	"XFSLog",
+	"XLV",
+	"XVM"
+};
+
 struct dparms {
 	u_int8_t	dp_skew;
 	u_int8_t	dp_gap1;
@@ -122,6 +139,17 @@
 	vp->vp_type = g_dec_be4((u_char *)&vp->vp_type);
 }
 
+static const char *
+g_fx_type(int32_t type)
+{
+	static size_t ntypes = sizeof fx_typename / sizeof fx_typename[0];
+
+	if (type < 0 || type >= ntypes) {
+		return ("Erroneous partition type.");
+	}
+	return (fx_typename[type]);
+}
+
 static int
 g_fx_start(struct bio *bp)
 {
@@ -193,14 +221,21 @@
 		if (g_dec_be4((u_char *)&label->vh_magic) != FX_LABEL_MAGIC)
 			break;
 		for (i = 0; i < FX_NPARTS; i++) {
-			npart++;
 			vp = &label->vh_part[i];
 			g_fx_swap_volpart(vp);
 			if (!vp->vp_size)
 				continue;
+			g_topology_lock();
 			g_slice_config(gp, i, G_SLICE_CONFIG_SET,
 			    vp->vp_begin, vp->vp_size, sectorsize,
 			    "%s%c", pp->name, 'a' + i);
+			g_topology_unlock();
+			if (bootverbose) {
+				printf("Added %s%c of type %d (%s)\n",
+				       pp->name, 'a' + i, vp->vp_type,
+				       g_fx_type(vp->vp_type));
+			}
+			npart++;
 		}
 		break;
 	}

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message