svn commit: r313998 - stable/10/sys/cam/ctl

[Kenneth D. Merry]

Author: ken
Date: Mon Feb 20 20:16:11 2017
New Revision: 313998
URL: https://svnweb.freebsd.org/changeset/base/313998

Log:
  MFC 313895:
  
    ------------------------------------------------------------------------
    r313895 | ken | 2017-02-17 13:15:27 -0700 (Fri, 17 Feb 2017) | 9 lines
  
    Make ctl(4) build with CTL_IO_DELAY defined.
  
    sys/cam/ctl/ctl.c:
    	In ctl_datamove(), inside CTL_IO_DELAY, add a lun variable and fill
    	it in before trying to dereference it.
  
    Sponsored by:	Spectra Logic
  
    ------------------------------------------------------------------------

Modified:
  stable/10/sys/cam/ctl/ctl.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/ctl/ctl.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl.c	Mon Feb 20 20:12:02 2017	(r313997)
+++ stable/10/sys/cam/ctl/ctl.c	Mon Feb 20 20:16:11 2017	(r313998)
@@ -12393,6 +12393,9 @@ ctl_datamove(union ctl_io *io)
 	if (io->io_hdr.flags & CTL_FLAG_DELAY_DONE) {
 		io->io_hdr.flags &= ~CTL_FLAG_DELAY_DONE;
 	} else {
+		struct ctl_lun *lun;
+
+		lun = CTL_LUN(io);
 		if ((lun != NULL)
 		 && (lun->delay_info.datamove_delay > 0)) {