From owner-svn-src-projects@FreeBSD.ORG  Fri Feb  4 16:04:43 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 711FE1065672;
	Fri,  4 Feb 2011 16:04:43 +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 606758FC19;
	Fri,  4 Feb 2011 16:04:43 +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 p14G4h3U089845;
	Fri, 4 Feb 2011 16:04:43 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p14G4heB089843;
	Fri, 4 Feb 2011 16:04:43 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201102041604.p14G4heB089843@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 4 Feb 2011 16:04:43 +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: r218282 - 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: Fri, 04 Feb 2011 16:04:43 -0000

Author: mav
Date: Fri Feb  4 16:04:43 2011
New Revision: 218282
URL: http://svn.freebsd.org/changeset/base/218282

Log:
  Until we have no real RESYNC implemented, handle it same as REBUILD.

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

Modified: projects/graid/head/sys/geom/raid/tr_raid1.c
==============================================================================
--- projects/graid/head/sys/geom/raid/tr_raid1.c	Fri Feb  4 15:47:14 2011	(r218281)
+++ projects/graid/head/sys/geom/raid/tr_raid1.c	Fri Feb  4 16:04:43 2011	(r218282)
@@ -372,7 +372,8 @@ g_raid_tr_raid1_maybe_rebuild(struct g_r
 	if (trs->trso_stopping)
 		return;
 	na = g_raid_nsubdisks(vol, G_RAID_SUBDISK_S_ACTIVE);
-	nr = g_raid_nsubdisks(vol, G_RAID_SUBDISK_S_REBUILD);
+	nr = g_raid_nsubdisks(vol, G_RAID_SUBDISK_S_REBUILD) +
+	    g_raid_nsubdisks(vol, G_RAID_SUBDISK_S_RESYNC);
 	switch(trs->trso_type) {
 	case TR_RAID1_NONE:
 		if (na == 0 || nr == 0)
@@ -402,11 +403,17 @@ g_raid_tr_event_raid1(struct g_raid_tr_o
 	vol = tr->tro_volume;
 	switch (event) {
 	case G_RAID_SUBDISK_E_NEW:
-		if (sd->sd_state == G_RAID_SUBDISK_S_NEW)
+		if (sd->sd_state == G_RAID_SUBDISK_S_NEW) {
+			sd->sd_rebuild_pos = 0;
 			g_raid_change_subdisk_state(sd, G_RAID_SUBDISK_S_REBUILD);
+		} else if (sd->sd_state == G_RAID_SUBDISK_S_STALE) {
+			sd->sd_rebuild_pos = 0;
+			g_raid_change_subdisk_state(sd, G_RAID_SUBDISK_S_RESYNC);
+		}
 		break;
 	case G_RAID_SUBDISK_E_FAILED:
-		if (trs->trso_type == TR_RAID1_REBUILD)
+		if (trs->trso_type == TR_RAID1_REBUILD ||
+		    trs->trso_type == TR_RAID1_RESYNC)
 			g_raid_tr_raid1_rebuild_abort(tr, vol);
 //		g_raid_change_subdisk_state(sd, G_RAID_SUBDISK_S_FAILED);
 		break;