From owner-svn-src-projects@FreeBSD.ORG  Thu Feb  3 18:47:13 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 C608F1065695;
	Thu,  3 Feb 2011 18:47:13 +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 B54B88FC19;
	Thu,  3 Feb 2011 18:47:13 +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 p13IlDQE054758;
	Thu, 3 Feb 2011 18:47:13 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p13IlDVC054756;
	Thu, 3 Feb 2011 18:47:13 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201102031847.p13IlDVC054756@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 3 Feb 2011 18:47:13 +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: r218230 - 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 18:47:13 -0000

Author: mav
Date: Thu Feb  3 18:47:13 2011
New Revision: 218230
URL: http://svn.freebsd.org/changeset/base/218230

Log:
  Fix writing/dumping to non-OPTIMAL RAID1 volumes.

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	Thu Feb  3 18:25:55 2011	(r218229)
+++ projects/graid/head/sys/geom/raid/tr_raid1.c	Thu Feb  3 18:47:13 2011	(r218230)
@@ -481,6 +481,7 @@ g_raid_tr_iostart_raid1_write(struct g_r
 			if (bp->bio_offset >= sd->sd_rebuild_pos)
 				continue;
 			break;
+		case G_RAID_SUBDISK_S_STALE:
 		case G_RAID_SUBDISK_S_RESYNC:
 			/*
 			 * Resyncing still writes on the theory that the
@@ -488,6 +489,7 @@ g_raid_tr_iostart_raid1_write(struct g_r
 			 * keep it that way better if we keep up while
 			 * resyncing.
 			 */
+			break;
 		default:
 			continue;
 		}
@@ -818,10 +820,23 @@ g_raid_tr_kerneldump_raid1(struct g_raid
 		switch (sd->sd_state) {
 		case G_RAID_SUBDISK_S_ACTIVE:
 			break;
-//		case G_RAID_DISK_STATE_SYNCHRONIZING:
-//			if (bp->bio_offset >= sync->ds_offset)
-//				continue;
-//			break;
+		case G_RAID_SUBDISK_S_REBUILD:
+			/*
+			 * When rebuilding, only part of this subdisk is
+			 * writable, the rest will be written as part of the
+			 * that process.
+			 */
+			if (offset >= sd->sd_rebuild_pos)
+				continue;
+			break;
+		case G_RAID_SUBDISK_S_STALE:
+		case G_RAID_SUBDISK_S_RESYNC:
+			/*
+			 * Resyncing still writes on the theory that the
+			 * resync'd disk is very close and writing it will
+			 * keep it that way better if we keep up while
+			 * resyncing.
+			 */
 		default:
 			continue;
 		}