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

[Alexander Motin]

Author: mav
Date: Mon Oct  5 10:42:07 2015
New Revision: 288775
URL: https://svnweb.freebsd.org/changeset/base/288775

Log:
  MFC r287968: Mark I/Os with DMA flag while moving data through the HA link.

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 Oct  5 10:41:08 2015	(r288774)
+++ stable/10/sys/cam/ctl/ctl.c	Mon Oct  5 10:42:07 2015	(r288775)
@@ -1150,6 +1150,7 @@ ctl_isc_event_handler(ctl_ha_channel cha
 			 */
 			io = msg->hdr.serializing_sc;
 			io->io_hdr.msg_type = CTL_MSG_DATAMOVE_DONE;
+			io->io_hdr.flags &= ~CTL_FLAG_DMA_INPROG;
 			io->io_hdr.flags |= CTL_FLAG_IO_ACTIVE;
 			io->io_hdr.port_status = msg->scsi.fetd_status;
 			io->scsiio.residual = msg->scsi.residual;
@@ -11060,6 +11061,7 @@ ctl_failover_lun(struct ctl_lun *lun)
 					io->flags |= CTL_FLAG_FAILOVER;
 				} else { /* This can be only due to DATAMOVE */
 					io->msg_type = CTL_MSG_DATAMOVE_DONE;
+					io->flags &= ~CTL_FLAG_DMA_INPROG;
 					io->flags |= CTL_FLAG_IO_ACTIVE;
 					io->port_status = 31340;
 					ctl_enqueue_isc((union ctl_io *)io);
@@ -12445,6 +12447,7 @@ ctl_datamove(union ctl_io *io)
 			return;
 		}
 		io->io_hdr.flags &= ~CTL_FLAG_IO_ACTIVE;
+		io->io_hdr.flags |= CTL_FLAG_DMA_INPROG;
 		if (lun)
 			mtx_unlock(&lun->lun_lock);
 	} else {