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 /include | |
| 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 'include')
| -rw-r--r-- | include/sys/vdev_impl.h | 2 | ||||
| -rw-r--r-- | include/sys/zio.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/sys/vdev_impl.h b/include/sys/vdev_impl.h index 1048dec5e..43c4c7941 100644 --- a/include/sys/vdev_impl.h +++ b/include/sys/vdev_impl.h @@ -60,7 +60,7 @@ typedef int vdev_open_func_t(vdev_t *vd, uint64_t *size, uint64_t *max_size, uint64_t *ashift); typedef void vdev_close_func_t(vdev_t *vd); typedef uint64_t vdev_asize_func_t(vdev_t *vd, uint64_t psize); -typedef int vdev_io_start_func_t(zio_t *zio); +typedef void vdev_io_start_func_t(zio_t *zio); typedef void vdev_io_done_func_t(zio_t *zio); typedef void vdev_state_change_func_t(vdev_t *vd, int, int); typedef void vdev_hold_func_t(vdev_t *vd); diff --git a/include/sys/zio.h b/include/sys/zio.h index 0368d9c59..d31b2acdd 100644 --- a/include/sys/zio.h +++ b/include/sys/zio.h @@ -153,9 +153,6 @@ typedef enum zio_priority { ZIO_PRIORITY_NOW /* non-queued i/os (e.g. free) */ } zio_priority_t; -#define ZIO_PIPELINE_CONTINUE 0x100 -#define ZIO_PIPELINE_STOP 0x101 - enum zio_flag { /* * Flags inherited by gang, ddt, and vdev children, |