From owner-p4-projects@FreeBSD.ORG  Fri Jun 15 20:42:57 2007
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 D8D4216A509; Fri, 15 Jun 2007 20:42:56 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B1C3D16A5AB
	for <perforce@FreeBSD.org>; Fri, 15 Jun 2007 20:42:56 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id A34F113C484
	for <perforce@FreeBSD.org>; Fri, 15 Jun 2007 20:42:56 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5FKguTQ049101
	for <perforce@FreeBSD.org>; Fri, 15 Jun 2007 20:42:56 GMT
	(envelope-from lulf@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5FKgu82049095
	for perforce@freebsd.org; Fri, 15 Jun 2007 20:42:56 GMT
	(envelope-from lulf@FreeBSD.org)
Date: Fri, 15 Jun 2007 20:42:56 GMT
Message-Id: <200706152042.l5FKgu82049095@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 121717 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: Fri, 15 Jun 2007 20:42:57 -0000

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

Change 121717 by lulf@lulf_carrot on 2007/06/15 20:42:36

	- Add returning correct value for "initializing"-state
	- Make it possible to set REVIVING and INITIALIZING states.

Affected files ...

.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_share.c#2 edit
.. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_state.c#11 edit

Differences ...

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

@@ -236,6 +236,8 @@
 		return (GV_SD_UP);
 	else if (!strcmp(buf, "reviving"))
 		return (GV_SD_REVIVING);
+	else if (!strcmp(buf, "initializing"))
+		return (GV_SD_INITIALIZING);
 	else if (!strcmp(buf, "stale"))
 		return (GV_SD_STALE);
 	else

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

@@ -202,6 +202,16 @@
 			return (GV_ERR_ISATTACHED);
 		break;
 
+	case GV_SD_REVIVING:
+	case GV_SD_INITIALIZING:
+		/*
+		 * Only do this if we're forced, since it usually is done
+		 * internally, and then we do use the force flag. 
+		 */
+		if (!flags & GV_SETSTATE_FORCE)
+			return (GV_ERR_SETSTATE);
+		break;
+
 	case GV_SD_UP:
 		/* We can't bring the subdisk up if our drive is dead. */
 		d = s->drive_sc;