From owner-svn-src-projects@FreeBSD.ORG  Wed Feb  9 12:03:22 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 AC6D8106566C;
	Wed,  9 Feb 2011 12:03:22 +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 9C8CC8FC19;
	Wed,  9 Feb 2011 12:03:22 +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 p19C3MPf082918;
	Wed, 9 Feb 2011 12:03:22 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p19C3MCh082916;
	Wed, 9 Feb 2011 12:03:22 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201102091203.p19C3MCh082916@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 9 Feb 2011 12:03:22 +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: r218480 - 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: Wed, 09 Feb 2011 12:03:22 -0000

Author: mav
Date: Wed Feb  9 12:03:22 2011
New Revision: 218480
URL: http://svn.freebsd.org/changeset/base/218480

Log:
  Allow to use completed portion of REBUILD and RESYNC subdisks for read
  errors recovery.

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	Wed Feb  9 11:49:58 2011	(r218479)
+++ projects/graid/head/sys/geom/raid/tr_raid1.c	Wed Feb  9 12:03:22 2011	(r218480)
@@ -806,7 +806,11 @@ g_raid_tr_iodone_raid1(struct g_raid_tr_
 		*mask |= 1 << sd->sd_pos;
 		for (i = 0; i < vol->v_disks_count; i++) {
 			nsd = &vol->v_subdisks[i];
-			if (nsd->sd_state != G_RAID_SUBDISK_S_ACTIVE)
+			if (nsd->sd_state != G_RAID_SUBDISK_S_ACTIVE &&
+			    !((nsd->sd_state == G_RAID_SUBDISK_S_REBUILD ||
+			       nsd->sd_state == G_RAID_SUBDISK_S_RESYNC) && 
+			      bp->bio_offset + bp->bio_length <
+			       nsd->sd_rebuild_pos))
 				continue;
 			if ((*mask & (1 << i)) != 0)
 				continue;