diff options
author | mav <mav@FreeBSD.org> | 2015-10-05 09:18:22 +0000 |
---|---|---|
committer | mav <mav@FreeBSD.org> | 2015-10-05 09:18:22 +0000 |
commit | 7a6cfae08e15c467682e110765fbb333a8086fdb (patch) | |
tree | e974f934812c5f4505c29d163be1e9b317546968 | |
parent | 77da07d14c70e2f2260bb579eaa4709a37f58748 (diff) | |
download | FreeBSD-src-7a6cfae08e15c467682e110765fbb333a8086fdb.zip FreeBSD-src-7a6cfae08e15c467682e110765fbb333a8086fdb.tar.gz |
MFC r287778: Remove CTL_PRIV_LBA_LEN from HA messages.
Previously it was used for statistics, but now just a 16 extra bytes.
-rw-r--r-- | sys/cam/ctl/ctl.c | 11 | ||||
-rw-r--r-- | sys/cam/ctl/ctl_io.h | 1 |
2 files changed, 0 insertions, 12 deletions
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index 64a1ccc..a95e9fb 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -518,8 +518,6 @@ ctl_isc_handler_finish_xfer(struct ctl_softc *ctl_softc, 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) + diff --git a/sys/cam/ctl/ctl_io.h b/sys/cam/ctl/ctl_io.h index fb46954..18eb93e 100644 --- a/sys/cam/ctl/ctl_io.h +++ b/sys/cam/ctl/ctl_io.h @@ -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 */ }; |