From owner-svn-src-projects@FreeBSD.ORG  Tue Feb  8 19:36:23 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 D6189106566C;
	Tue,  8 Feb 2011 19:36:23 +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 C4F168FC1D;
	Tue,  8 Feb 2011 19:36:23 +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 p18JaNpL057292;
	Tue, 8 Feb 2011 19:36:23 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p18JaNdt057290;
	Tue, 8 Feb 2011 19:36:23 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201102081936.p18JaNdt057290@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 8 Feb 2011 19:36:23 +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: r218450 - 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: Tue, 08 Feb 2011 19:36:23 -0000

Author: mav
Date: Tue Feb  8 19:36:23 2011
New Revision: 218450
URL: http://svn.freebsd.org/changeset/base/218450

Log:
  Do not try to fail disk on rebuild write error if rebuild was aborted.
  If disk disappeared/replaced during write operation then attempt to fail
  it may target the innocent new disk or even placeholder.

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	Tue Feb  8 19:28:13 2011	(r218449)
+++ projects/graid/head/sys/geom/raid/tr_raid1.c	Tue Feb  8 19:36:23 2011	(r218450)
@@ -683,7 +683,8 @@ g_raid_tr_iodone_raid1(struct g_raid_tr_
 				nsd = trs->trso_failed_sd;
 				if (bp->bio_error != 0 ||
 				    trs->trso_flags & TR_RAID1_F_ABORT) {
-					if (bp->bio_error != 0) {
+					if ((trs->trso_flags &
+					    TR_RAID1_F_ABORT) == 0) {
 						g_raid_fail_disk(sd->sd_softc,
 						    nsd, nsd->sd_disk);
 					}