svn commit: r312846 - stable/11/sys/cam/ctl

[Alexander Motin]

Author: mav
Date: Thu Jan 26 21:08:27 2017
New Revision: 312846
URL: https://svnweb.freebsd.org/changeset/base/312846

Log:
  MFC r312231: When in kernel, map ctl_scsi_zero_io() to ctl_zero_io().

Modified:
  stable/11/sys/cam/ctl/ctl_util.c
  stable/11/sys/cam/ctl/ctl_util.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cam/ctl/ctl_util.c
==============================================================================
--- stable/11/sys/cam/ctl/ctl_util.c	Thu Jan 26 21:07:46 2017	(r312845)
+++ stable/11/sys/cam/ctl/ctl_util.c	Thu Jan 26 21:08:27 2017	(r312846)
@@ -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/11/sys/cam/ctl/ctl_util.h
==============================================================================
--- stable/11/sys/cam/ctl/ctl_util.h	Thu Jan 26 21:07:46 2017	(r312845)
+++ stable/11/sys/cam/ctl/ctl_util.h	Thu Jan 26 21:08:27 2017	(r312846)
@@ -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,