Attachment #186415 for bug #222288

Lines 236-245 enum zio_stage { Link Here

(-)b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h (+6 lines)
236	(ZIO_INTERLOCK_STAGES \| \	236	(ZIO_INTERLOCK_STAGES \| \
237	ZIO_STAGE_DVA_CLAIM)	237	ZIO_STAGE_DVA_CLAIM)
238		238
		239	#ifdef illumos
239	#define ZIO_IOCTL_PIPELINE \	240	#define ZIO_IOCTL_PIPELINE \
240	(ZIO_INTERLOCK_STAGES \| \	241	(ZIO_INTERLOCK_STAGES \| \
241	ZIO_STAGE_VDEV_IO_START \| \	242	ZIO_STAGE_VDEV_IO_START \| \
242	ZIO_STAGE_VDEV_IO_ASSESS)	243	ZIO_STAGE_VDEV_IO_ASSESS)
		244	#else
		245	#define ZIO_IOCTL_PIPELINE \
		246	(ZIO_INTERLOCK_STAGES \| \
		247	ZIO_VDEV_IO_STAGES)
		248	#endif
243		249
244	#define ZIO_BLOCKING_STAGES \	250	#define ZIO_BLOCKING_STAGES \
245	(ZIO_STAGE_DVA_ALLOCATE \| \	251	(ZIO_STAGE_DVA_ALLOCATE \| \

Lines 3249-3255 zio_vdev_io_done(zio_t *zio) Link Here

(-)b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c (-1 / +2 lines)
3249	return (ZIO_PIPELINE_STOP);	3249	return (ZIO_PIPELINE_STOP);
3250		3250
3251	ASSERT(zio->io_type == ZIO_TYPE_READ \|\|	3251	ASSERT(zio->io_type == ZIO_TYPE_READ \|\|
3252	zio->io_type == ZIO_TYPE_WRITE \|\| zio->io_type == ZIO_TYPE_FREE);	3252	zio->io_type == ZIO_TYPE_WRITE \|\| zio->io_type == ZIO_TYPE_FREE \|\|
		3253	zio->io_type == ZIO_TYPE_IOCTL);
3253		3254
3254	if (vd != NULL && vd->vdev_ops->vdev_op_leaf &&	3255	if (vd != NULL && vd->vdev_ops->vdev_op_leaf &&
3255	(zio->io_type == ZIO_TYPE_READ \|\| zio->io_type == ZIO_TYPE_WRITE \|\|	3256	(zio->io_type == ZIO_TYPE_READ \|\| zio->io_type == ZIO_TYPE_WRITE \|\|

Return to bug 222288