Author: mav
Date: Thu Jan 26 21:08:58 2017
New Revision: 312847
URL: https://svnweb.freebsd.org/changeset/base/312847
Log:
MFC r312231: When in kernel, map ctl_scsi_zero_io() to ctl_zero_io().
Modified:
stable/10/sys/cam/ctl/ctl_util.c
stable/10/sys/cam/ctl/ctl_util.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/ctl/ctl_util.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl_util.c Thu Jan 26 21:08:27 2017
(r312846)
+++ stable/10/sys/cam/ctl/ctl_util.c Thu Jan 26 21:08:58 2017
(r312847)
@@ -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)
Modified: stable/10/sys/cam/ctl/ctl_util.h
==============================================================================
--- stable/10/sys/cam/ctl/ctl_util.h Thu Jan 26 21:08:27 2017
(r312846)
+++ stable/10/sys/cam/ctl/ctl_util.h Thu Jan 26 21:08:58 2017
(r312847)
@@ -96,8 +96,10 @@ void ctl_scsi_maintenance_in(union ctl_i
#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,
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
