From f43615d0cc22d7db496c1291c84e64e269ca51d9 Mon Sep 17 00:00:00 2001 From: Olaf Faaland Date: Tue, 18 Jul 2017 11:43:55 -0700 Subject: [PATCH] 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 Signed-off-by: Olaf Faaland --- module/zfs/zio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/zfs/zio.c b/module/zfs/zio.c index fe47bb6b136a..acfc49eb5f47 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);