Skip to content

Commit

Permalink
Revert "Fix vdev_probe() call outside SCL_STATE_ALL lock"
Browse files Browse the repository at this point in the history
This reverts commit cc9c6bc.

The async zios executed via zio_nowait() are protected by SCL_ZIO which
is taken by the zio pipeline itself in the IO_START stage and released
in the IO_ASSES stage if zio->io_flag does not contain CONFIG_WRITER.

In addition, the vdev_probe() patch causes ztest to fail consistently.

Signed-off-by: Olaf Faaland <faaland1@llnl.gov>
  • Loading branch information
ofaaland committed Jul 22, 2017
1 parent 7a8ed6b commit 45b45a4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion module/zfs/zio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 45b45a4

Please sign in to comment.