svn commit: r242328 - head/sys/geom/raid

[Alexander Motin]

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);
 		}