svn commit: r330523 - stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Alan Somers]

Author: asomers
Date: Mon Mar  5 20:37:54 2018
New Revision: 330523
URL: https://svnweb.freebsd.org/changeset/base/330523

Log:
  MFC r326400
  
  Revert r326399
  
  Accidentally committed wrong file
  
  Pointy hat to:  asomers
  Sponsored by:   Spectra Logic Corp

Modified:
  stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c	Mon Mar  5 20:28:49 2018	(r330522)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c	Mon Mar  5 20:37:54 2018	(r330523)
@@ -2398,7 +2398,7 @@ vdev_raidz_io_done(zio_t *zio)
 				 */
 				if (parity_errors + parity_untried <
 				    rm->rm_firstdatacol ||
-				    (zio->io_flags & (ZIO_FLAG_RESILVER | ZIO_FLAG_SCRUB))) {
+				    (zio->io_flags & ZIO_FLAG_RESILVER)) {
 					n = raidz_parity_verify(zio, rm);
 					unexpected_errors += n;
 					ASSERT(parity_errors + n <=
@@ -2450,7 +2450,7 @@ vdev_raidz_io_done(zio_t *zio)
 				 * out to failed devices later.
 				 */
 				if (parity_errors < rm->rm_firstdatacol - n ||
-				    (zio->io_flags & (ZIO_FLAG_RESILVER | ZIO_FLAG_SCRUB))) {
+				    (zio->io_flags & ZIO_FLAG_RESILVER)) {
 					n = raidz_parity_verify(zio, rm);
 					unexpected_errors += n;
 					ASSERT(parity_errors + n <=
@@ -2552,8 +2552,7 @@ done:
 	zio_checksum_verified(zio);
 
 	if (zio->io_error == 0 && spa_writeable(zio->io_spa) &&
-	    (unexpected_errors ||
-	        (zio->io_flags & (ZIO_FLAG_RESILVER | ZIO_FLAG_SCRUB)))) {
+	    (unexpected_errors || (zio->io_flags & ZIO_FLAG_RESILVER))) {
 		/*
 		 * Use the good data we have in hand to repair damaged children.
 		 */