Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Feb 2017 20:15:27 +0000 (UTC)
From:      "Kenneth D. Merry" <ken@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r313895 - head/sys/cam/ctl
Message-ID:  <201702172015.v1HKFRnU091726@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ken
Date: Fri Feb 17 20:15:27 2017
New Revision: 313895
URL: https://svnweb.freebsd.org/changeset/base/313895

Log:
  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.
  
  MFC after:	3 days
  Sponsored by:	Spectra Logic

Modified:
  head/sys/cam/ctl/ctl.c

Modified: head/sys/cam/ctl/ctl.c
==============================================================================
--- head/sys/cam/ctl/ctl.c	Fri Feb 17 20:07:35 2017	(r313894)
+++ head/sys/cam/ctl/ctl.c	Fri Feb 17 20:15:27 2017	(r313895)
@@ -12405,6 +12405,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)) {
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702172015.v1HKFRnU091726>