diff options
| author | George Wilson <[email protected]> | 2014-10-20 22:07:45 +0000 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-04-30 15:07:47 -0700 |
| commit | 98b254188a730553361adfabca9f658421be2b82 (patch) | |
| tree | af1e47047131dec542f7f0637557cba5c22a1d46 /module/zfs/vdev_file.c | |
| parent | 8dd86a10cf836d64cddd9c8693f449686e35788c (diff) | |
Illumos #5244 - zio pipeline callers should explicitly invoke next stage
5244 zio pipeline callers should explicitly invoke next stage
Reviewed by: Adam Leventhal <[email protected]>
Reviewed by: Alex Reece <[email protected]>
Reviewed by: Christopher Siden <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Richard Elling <[email protected]>
Reviewed by: Dan McDonald <[email protected]>
Reviewed by: Steven Hartland <[email protected]>
Approved by: Gordon Ross <[email protected]>
References:
https://www.illumos.org/issues/5244
https://github.com/illumos/illumos-gate/commit/738f37b
Porting Notes:
1. The unported "2932 support crash dumps to raidz, etc. pools"
caused a merge conflict due to a copyright difference in
module/zfs/vdev_raidz.c.
2. The unported "4128 disks in zpools never go away when pulled"
and additional Linux-specific changes caused merge conflicts in
module/zfs/vdev_disk.c.
Ported-by: Richard Yao <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #2828
Diffstat (limited to 'module/zfs/vdev_file.c')
| -rw-r--r-- | module/zfs/vdev_file.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/module/zfs/vdev_file.c b/module/zfs/vdev_file.c index 7f43ad800..3c3a13993 100644 --- a/module/zfs/vdev_file.c +++ b/module/zfs/vdev_file.c @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2011, 2014 by Delphix. All rights reserved. */ #include <sys/zfs_context.h> @@ -172,7 +172,7 @@ vdev_file_io_fsync(void *arg) zio_interrupt(zio); } -static int +static void vdev_file_io_start(zio_t *zio) { vdev_t *vd = zio->io_vd; @@ -182,7 +182,8 @@ vdev_file_io_start(zio_t *zio) /* XXPOLICY */ if (!vdev_readable(vd)) { zio->io_error = SET_ERROR(ENXIO); - return (ZIO_PIPELINE_CONTINUE); + zio_interrupt(zio); + return; } switch (zio->io_cmd) { @@ -201,7 +202,7 @@ vdev_file_io_start(zio_t *zio) if (spl_fstrans_check()) { VERIFY3U(taskq_dispatch(vdev_file_taskq, vdev_file_io_fsync, zio, TQ_SLEEP), !=, 0); - return (ZIO_PIPELINE_STOP); + return; } zio->io_error = VOP_FSYNC(vf->vf_vnode, FSYNC | FDSYNC, @@ -211,13 +212,12 @@ vdev_file_io_start(zio_t *zio) zio->io_error = SET_ERROR(ENOTSUP); } - return (ZIO_PIPELINE_CONTINUE); + zio_execute(zio); + return; } VERIFY3U(taskq_dispatch(vdev_file_taskq, vdev_file_io_strategy, zio, TQ_SLEEP), !=, 0); - - return (ZIO_PIPELINE_STOP); } /* ARGSUSED */ |