Author: mav
Date: Mon Oct 5 09:18:22 2015
New Revision: 288755
URL: https://svnweb.freebsd.org/changeset/base/288755
Log:
MFC r287778: Remove CTL_PRIV_LBA_LEN from HA messages.
Previously it was used for statistics, but now just a 16 extra bytes.
Modified:
stable/10/sys/cam/ctl/ctl.c
stable/10/sys/cam/ctl/ctl_io.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/ctl/ctl.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl.c Mon Oct 5 09:16:55 2015 (r288754)
+++ stable/10/sys/cam/ctl/ctl.c Mon Oct 5 09:18:22 2015 (r288755)
@@ -518,8 +518,6 @@ ctl_isc_handler_finish_xfer(struct ctl_s
ctsio->residual = msg_info->scsi.residual;
memcpy(&ctsio->sense_data, &msg_info->scsi.sense_data,
msg_info->scsi.sense_len);
- memcpy(&ctsio->io_hdr.ctl_private[CTL_PRIV_LBA_LEN].bytes,
- &msg_info->scsi.lbalen, sizeof(msg_info->scsi.lbalen));
ctl_enqueue_isc((union ctl_io *)ctsio);
}
@@ -12978,15 +12976,6 @@ bailout:
msg.scsi.residual = io->scsiio.residual;
memcpy(&msg.scsi.sense_data, &io->scsiio.sense_data,
io->scsiio.sense_len);
- /*
- * We copy this whether or not this is an I/O-related
- * command. Otherwise, we'd have to go and check to see
- * whether it's a read/write command, and it really isn't
- * worth it.
- */
- memcpy(&msg.scsi.lbalen,
- &io->io_hdr.ctl_private[CTL_PRIV_LBA_LEN].bytes,
- sizeof(msg.scsi.lbalen));
ctl_ha_msg_send(CTL_HA_CHAN_CTL, &msg,
sizeof(msg.scsi) - sizeof(msg.scsi.sense_data) +
Modified: stable/10/sys/cam/ctl/ctl_io.h
==============================================================================
--- stable/10/sys/cam/ctl/ctl_io.h Mon Oct 5 09:16:55 2015
(r288754)
+++ stable/10/sys/cam/ctl/ctl_io.h Mon Oct 5 09:18:22 2015
(r288755)
@@ -452,7 +452,6 @@ struct ctl_ha_msg_scsi {
uint32_t residual; /* data residual length */
uint32_t fetd_status; /* trans status, set by FETD,
0 = good*/
- struct ctl_lba_len lbalen; /* used for stats */
struct scsi_sense_data sense_data; /* sense data */
};
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
