Attachment 186415 Details for Bug 222288 – work in progress

[patch] work in progress

zio-ioctl-pipeline.diff (text/plain), 1.40 KB, created by Andriy Gapon on 2017-09-15 14:00:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Gapon

Created: 2017-09-15 14:00:05 UTC

Size: 1.40 KB

patch

obsolete

>diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h
>index 96b3b01358137..599346eef9e3a 100644
>--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h
>+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h
>@@ -236,10 +236,16 @@ enum zio_stage {
> 	(ZIO_INTERLOCK_STAGES |			\
> 	ZIO_STAGE_DVA_CLAIM)
> 
>+#ifdef illumos
> #define	ZIO_IOCTL_PIPELINE			\
> 	(ZIO_INTERLOCK_STAGES |			\
> 	ZIO_STAGE_VDEV_IO_START |		\
> 	ZIO_STAGE_VDEV_IO_ASSESS)
>+#else
>+#define	ZIO_IOCTL_PIPELINE			\
>+	(ZIO_INTERLOCK_STAGES |			\
>+	ZIO_VDEV_IO_STAGES)
>+#endif
> 
> #define	ZIO_BLOCKING_STAGES			\
> 	(ZIO_STAGE_DVA_ALLOCATE |		\
>diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
>index aa43e69a13ad4..8c30499382699 100644
>--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
>+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
>@@ -3249,7 +3249,8 @@ zio_vdev_io_done(zio_t *zio)
> 		return (ZIO_PIPELINE_STOP);
> 
> 	ASSERT(zio->io_type == ZIO_TYPE_READ ||
>-	    zio->io_type == ZIO_TYPE_WRITE || zio->io_type == ZIO_TYPE_FREE);
>+	    zio->io_type == ZIO_TYPE_WRITE || zio->io_type == ZIO_TYPE_FREE ||
>+	    zio->io_type == ZIO_TYPE_IOCTL);
> 
> 	if (vd != NULL && vd->vdev_ops->vdev_op_leaf &&
> 	    (zio->io_type == ZIO_TYPE_READ || zio->io_type == ZIO_TYPE_WRITE ||

Actions: View | Diff

Attachments on bug 222288: 186415 | 186510