From 3adfc400f5f6c8b24b825cbe91c14b7d58f3c7fc Mon Sep 17 00:00:00 2001 From: Andriy Gapon Date: Mon, 9 Apr 2012 13:01:46 -0400 Subject: [PATCH] Illumos #1680: zfs vdev_file_io_start: validate vdev before using vdev_tsd vdev_tsd can be NULL for certain vdev states. At least in userland testing with ztest. References to Illumos issue: https://www.illumos.org/issues/1680 Ported-by: Richard Yao Signed-off-by: Brian Behlendorf Closes #655 --- module/zfs/vdev_file.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/module/zfs/vdev_file.c b/module/zfs/vdev_file.c index bbc85e733..ce49fe08f 100644 --- a/module/zfs/vdev_file.c +++ b/module/zfs/vdev_file.c @@ -141,16 +141,17 @@ static int vdev_file_io_start(zio_t *zio) { vdev_t *vd = zio->io_vd; - vdev_file_t *vf = vd->vdev_tsd; + vdev_file_t *vf; ssize_t resid = 0; - if (zio->io_type == ZIO_TYPE_IOCTL) { - /* XXPOLICY */ - if (!vdev_readable(vd)) { - zio->io_error = ENXIO; - return (ZIO_PIPELINE_CONTINUE); - } + if (!vdev_readable(vd)) { + zio->io_error = ENXIO; + return (ZIO_PIPELINE_CONTINUE); + } + vf = vd->vdev_tsd; + + if (zio->io_type == ZIO_TYPE_IOCTL) { switch (zio->io_cmd) { case DKIOCFLUSHWRITECACHE: zio->io_error = VOP_FSYNC(vf->vf_vnode, FSYNC | FDSYNC, -- 2.40.0