From owner-p4-projects@FreeBSD.ORG  Mon Jul 23 17:31:21 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A145C16A41B; Mon, 23 Jul 2007 17:31:21 +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 E934E16A417
	for <perforce@FreeBSD.org>; Mon, 23 Jul 2007 17:31:20 +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 E281513C46E
	for <perforce@FreeBSD.org>; Mon, 23 Jul 2007 17:31:20 +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 l6NHVK7n096991
	for <perforce@FreeBSD.org>; Mon, 23 Jul 2007 17:31:20 GMT
	(envelope-from lulf@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6NHVKK1096988
	for perforce@freebsd.org; Mon, 23 Jul 2007 17:31:20 GMT
	(envelope-from lulf@FreeBSD.org)
Date: Mon, 23 Jul 2007 17:31:20 GMT
Message-Id: <200707231731.l6NHVKK1096988@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 123979 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, 23 Jul 2007 17:31:22 -0000

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

Change 123979 by lulf@lulf_carrot on 2007/07/23 17:31:10

	- Change order of GV_PLEX_DEGRADED and _RESIZING, since we now allow
	  mounted rebuilds.
	- Make use of bio_pflags and a bad misuse of GV_BIO_SYNCREQ to determine
	  if we're handling a resize BIO. But, since the bio_?flags-fields are only
	  eight bits...

Affected files ...

.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#19 edit
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#23 edit

Differences ...

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

@@ -377,7 +377,7 @@
 			gv_rebuild_complete(p, pbp);
 		} else if (pbp->bio_cflags & GV_BIO_INIT) {
 			gv_init_complete(p, pbp);
-		} else if (p->state == GV_PLEX_RESIZING) {
+		} else if (pbp->bio_pflags & GV_BIO_SYNCREQ) {
 			gv_grow_complete(p, pbp);
 		} else {
 			g_io_deliver(pbp, pbp->bio_error);
@@ -628,6 +628,7 @@
 	bp->bio_error = 0;
 	bp->bio_offset = offset;
 	bp->bio_length = length;
+	bp->bio_pflags |= GV_BIO_SYNCREQ; /* XXX: misuse of pflags AND syncreq.*/
 	if (data == NULL)
 		data = g_malloc(length, M_WAITOK);
 	bp->bio_cflags |= GV_BIO_MALLOC;

==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#23 (text+ko) ====

@@ -310,8 +310,8 @@
 	int	state;			/* The plex state. */
 #define	GV_PLEX_DOWN		0
 #define	GV_PLEX_INITIALIZING	1
-#define GV_PLEX_RESIZING	2
-#define	GV_PLEX_DEGRADED	3
+#define	GV_PLEX_DEGRADED	2
+#define GV_PLEX_RESIZING	3
 #define	GV_PLEX_UP		4
 
 	int	org;			/* The plex organisation. */