From: Olaf Faaland <faaland1@llnl.gov>
Date: Tue, 18 Jul 2017 18:43:55 +0000 (-0700)
Subject: Revert Fix vdev_probe() call wrt SCL_STATE_ALL
X-Git-Tag: zfs-0.7.0~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f43615d0cc22d7db496c1291c84e64e269ca51d9;p=zfs

Revert Fix vdev_probe() call wrt SCL_STATE_ALL

This reverts commit cc9c6bc, which has been causing intermittent
test failures on buildbot.  A correct fix for this locking issue
has been applied in a separate patch.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Olaf Faaland <faaland1@llnl.gov>
---

diff --git a/module/zfs/zio.c b/module/zfs/zio.c
index fe47bb6b1..acfc49eb5 100644
--- a/module/zfs/zio.c
+++ b/module/zfs/zio.c
@@ -3325,7 +3325,7 @@ zio_vdev_io_done(zio_t *zio)
 
 	ops->vdev_op_io_done(zio);
 
-	if (unexpected_error && zio->io_waiter != NULL)
+	if (unexpected_error)
 		VERIFY(vdev_probe(vd, zio) == NULL);
 
 	return (ZIO_PIPELINE_CONTINUE);