From owner-svn-src-projects@FreeBSD.ORG  Thu Feb  3 20:27:21 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3DCCE1065674;
	Thu,  3 Feb 2011 20:27:21 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2EA628FC1F;
	Thu,  3 Feb 2011 20:27:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p13KRLbh057487;
	Thu, 3 Feb 2011 20:27:21 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p13KRLAW057485;
	Thu, 3 Feb 2011 20:27:21 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201102032027.p13KRLAW057485@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 3 Feb 2011 20:27:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218239 - projects/graid/head/sys/geom/raid
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Feb 2011 20:27:21 -0000

Author: mav
Date: Thu Feb  3 20:27:20 2011
New Revision: 218239
URL: http://svn.freebsd.org/changeset/base/218239

Log:
  Do not update subdisk state from NONE and ACTIVE to ACTIVE. First is wrong.
  last is pointless.

Modified:
  projects/graid/head/sys/geom/raid/tr_raid0.c

Modified: projects/graid/head/sys/geom/raid/tr_raid0.c
==============================================================================
--- projects/graid/head/sys/geom/raid/tr_raid0.c	Thu Feb  3 20:26:26 2011	(r218238)
+++ projects/graid/head/sys/geom/raid/tr_raid0.c	Thu Feb  3 20:27:20 2011	(r218239)
@@ -140,7 +140,9 @@ g_raid_tr_event_raid0(struct g_raid_tr_o
 	sc = vol->v_softc;
 	if (event == G_RAID_SUBDISK_E_NEW) {
 		state = sd->sd_state;
-		if (state != G_RAID_SUBDISK_S_FAILED)
+		if (state != G_RAID_SUBDISK_S_NONE &&
+		    state != G_RAID_SUBDISK_S_FAILED &&
+		    state != G_RAID_SUBDISK_S_ACTIVE)
 			g_raid_change_subdisk_state(sd, G_RAID_SUBDISK_S_ACTIVE);
 		if (state != sd->sd_state &&
 		    !trs->trso_starting && !trs->trso_stopped)