From owner-svn-src-head@FreeBSD.ORG  Mon Oct 29 21:08:07 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 948BDFA;
 Mon, 29 Oct 2012 21:08:07 +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 792AE8FC0A;
 Mon, 29 Oct 2012 21:08:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9TL877V044498;
 Mon, 29 Oct 2012 21:08:07 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9TL87r8044495;
 Mon, 29 Oct 2012 21:08:07 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201210292108.q9TL87r8044495@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 29 Oct 2012 21:08:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242328 - head/sys/geom/raid
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Oct 2012 21:08:07 -0000

Author: mav
Date: Mon Oct 29 21:08:06 2012
New Revision: 242328
URL: http://svn.freebsd.org/changeset/base/242328

Log:
  Minor addition to r242323:
  Alike to BIO_WRITE, report success if at least one subdisk succeeded with
  BIO_DELETE.  But unlike BIO_WRITE don't fail disk on BIO_DELETE error.
  
  Sponsored by:	iXsystems, Inc.
  MFC after:	1 month

Modified:
  head/sys/geom/raid/tr_raid1.c
  head/sys/geom/raid/tr_raid1e.c

Modified: head/sys/geom/raid/tr_raid1.c
==============================================================================
--- head/sys/geom/raid/tr_raid1.c	Mon Oct 29 20:47:32 2012	(r242327)
+++ head/sys/geom/raid/tr_raid1.c	Mon Oct 29 21:08:06 2012	(r242328)
@@ -891,10 +891,10 @@ rebuild_round_done:
 		g_raid_unlock_range(sd->sd_volume, bp->bio_offset,
 		    bp->bio_length);
 	}
-	if (pbp->bio_cmd == BIO_WRITE) {
+	if (pbp->bio_cmd != BIO_READ) {
 		if (pbp->bio_inbed == 1 || pbp->bio_error != 0)
 			pbp->bio_error = bp->bio_error;
-		if (bp->bio_error != 0) {
+		if (pbp->bio_cmd == BIO_WRITE && bp->bio_error != 0) {
 			G_RAID_LOGREQ(0, bp, "Write failed: failing subdisk.");
 			g_raid_tr_raid1_fail_disk(sd->sd_softc, sd, sd->sd_disk);
 		}

Modified: head/sys/geom/raid/tr_raid1e.c
==============================================================================
--- head/sys/geom/raid/tr_raid1e.c	Mon Oct 29 20:47:32 2012	(r242327)
+++ head/sys/geom/raid/tr_raid1e.c	Mon Oct 29 21:08:06 2012	(r242328)
@@ -1118,10 +1118,10 @@ rebuild_round_done:
 		G_RAID_LOGREQ(2, bp, "REMAP done %d.", bp->bio_error);
 		g_raid_unlock_range(sd->sd_volume, virtual, bp->bio_length);
 	}
-	if (pbp->bio_cmd == BIO_WRITE) {
+	if (pbp->bio_cmd != BIO_READ) {
 		if (pbp->bio_inbed == 1 || pbp->bio_error != 0)
 			pbp->bio_error = bp->bio_error;
-		if (bp->bio_error != 0) {
+		if (pbp->bio_cmd == BIO_WRITE && bp->bio_error != 0) {
 			G_RAID_LOGREQ(0, bp, "Write failed: failing subdisk.");
 			g_raid_tr_raid1e_fail_disk(sd->sd_softc, sd, sd->sd_disk);
 		}