From owner-svn-src-projects@FreeBSD.ORG  Sun Feb  6 21:31:28 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 F23C21065674;
	Sun,  6 Feb 2011 21:31:28 +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 E087C8FC08;
	Sun,  6 Feb 2011 21:31:28 +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 p16LVSgo077531;
	Sun, 6 Feb 2011 21:31:28 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p16LVSnd077529;
	Sun, 6 Feb 2011 21:31:28 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201102062131.p16LVSnd077529@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 6 Feb 2011 21:31:28 +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: r218380 - 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: Sun, 06 Feb 2011 21:31:29 -0000

Author: mav
Date: Sun Feb  6 21:31:28 2011
New Revision: 218380
URL: http://svn.freebsd.org/changeset/base/218380

Log:
  RAID0 doesn't really need to know what event for subdisk came from metadata
  layer. New state is all it needs to know.

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	Sun Feb  6 20:11:24 2011	(r218379)
+++ projects/graid/head/sys/geom/raid/tr_raid0.c	Sun Feb  6 21:31:28 2011	(r218380)
@@ -137,19 +137,15 @@ g_raid_tr_event_raid0(struct g_raid_tr_o
 	trs = (struct g_raid_tr_raid0_object *)tr;
 	vol = tr->tro_volume;
 	sc = vol->v_softc;
-	if (event == G_RAID_SUBDISK_E_NEW) {
-		state = sd->sd_state;
-		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)
-			g_raid_write_metadata(sc, vol, sd, NULL);
-	} else if (event == G_RAID_SUBDISK_E_FAILED) {
-//		g_raid_change_subdisk_state(sd, G_RAID_SUBDISK_S_FAILED);
-	} else
-		g_raid_change_subdisk_state(sd, G_RAID_SUBDISK_S_NONE);
+
+	state = sd->sd_state;
+	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)
+		g_raid_write_metadata(sc, vol, sd, NULL);
 	g_raid_tr_update_state_raid0(vol);
 	return (0);
 }