diff options
| author | mav <mav@FreeBSD.org> | 2017-01-26 21:08:58 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2017-01-26 21:08:58 +0000 |
| commit | 062d9c23a010171180a51cc0eec2ad12ba23b7fb (patch) | |
| tree | ec12bb5be4b94374cd2ad6652342f17f4d87970c /sys/cam | |
| parent | 66563cf464228fb1c480d6e5d1a3fec0b7121067 (diff) | |
| download | FreeBSD-src-062d9c23a010171180a51cc0eec2ad12ba23b7fb.zip FreeBSD-src-062d9c23a010171180a51cc0eec2ad12ba23b7fb.tar.gz | |
MFC r312231: When in kernel, map ctl_scsi_zero_io() to ctl_zero_io().
Diffstat (limited to 'sys/cam')
| -rw-r--r-- | sys/cam/ctl/ctl_util.c | 4 | ||||
| -rw-r--r-- | sys/cam/ctl/ctl_util.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/cam/ctl/ctl_util.c b/sys/cam/ctl/ctl_util.c index 6fcec03..33f0899 100644 --- a/sys/cam/ctl/ctl_util.c +++ b/sys/cam/ctl/ctl_util.c @@ -697,7 +697,6 @@ ctl_scsi_free_io(union ctl_io *io) free(io); } -#endif /* !_KERNEL */ void ctl_scsi_zero_io(union ctl_io *io) { @@ -707,11 +706,10 @@ ctl_scsi_zero_io(union ctl_io *io) return; pool_ref = io->io_hdr.pool; - memset(io, 0, sizeof(*io)); - io->io_hdr.pool = pool_ref; } +#endif /* !_KERNEL */ const char * ctl_scsi_task_string(struct ctl_taskio *taskio) diff --git a/sys/cam/ctl/ctl_util.h b/sys/cam/ctl/ctl_util.h index 2966b49..67c0915 100644 --- a/sys/cam/ctl/ctl_util.h +++ b/sys/cam/ctl/ctl_util.h @@ -96,8 +96,10 @@ void ctl_scsi_maintenance_in(union ctl_io *io, uint8_t *data_ptr, #ifndef _KERNEL union ctl_io *ctl_scsi_alloc_io(uint32_t initid); void ctl_scsi_free_io(union ctl_io *io); -#endif /* !_KERNEL */ void ctl_scsi_zero_io(union ctl_io *io); +#else +#define ctl_scsi_zero_io(io) ctl_zero_io(io) +#endif /* !_KERNEL */ const char *ctl_scsi_task_string(struct ctl_taskio *taskio); void ctl_io_sbuf(union ctl_io *io, struct sbuf *sb); void ctl_io_error_sbuf(union ctl_io *io, |
