svn commit: r274790 - head/sys/cam/ctl
Alexander Motin
mav at FreeBSD.org
Fri Nov 21 11:21:40 UTC 2014
Author: mav
Date: Fri Nov 21 11:21:39 2014
New Revision: 274790
URL: https://svnweb.freebsd.org/changeset/base/274790
Log:
Remove bunch of unused lun variables.
MFC after: 1 week
Modified:
head/sys/cam/ctl/ctl.c
Modified: head/sys/cam/ctl/ctl.c
==============================================================================
--- head/sys/cam/ctl/ctl.c Fri Nov 21 11:20:24 2014 (r274789)
+++ head/sys/cam/ctl/ctl.c Fri Nov 21 11:21:39 2014 (r274790)
@@ -7407,14 +7407,11 @@ ctl_read_defect(struct ctl_scsiio *ctsio
struct scsi_read_defect_data_12 *ccb12;
struct scsi_read_defect_data_hdr_10 *data10;
struct scsi_read_defect_data_hdr_12 *data12;
- struct ctl_lun *lun;
uint32_t alloc_len, data_len;
uint8_t format;
CTL_DEBUG_PRINT(("ctl_read_defect\n"));
- lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
-
if (ctsio->cdb[0] == READ_DEFECT_DATA_10) {
ccb10 = (struct scsi_read_defect_data_10 *)&ctsio->cdb;
format = ccb10->format;
@@ -7784,7 +7781,6 @@ fill_one:
int
ctl_report_supported_tmf(struct ctl_scsiio *ctsio)
{
- struct ctl_lun *lun;
struct scsi_report_supported_tmf *cdb;
struct scsi_report_supported_tmf_data *data;
int retval;
@@ -7793,7 +7789,6 @@ ctl_report_supported_tmf(struct ctl_scsi
CTL_DEBUG_PRINT(("ctl_report_supported_tmf\n"));
cdb = (struct scsi_report_supported_tmf *)ctsio->cdb;
- lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
retval = CTL_RETVAL_COMPLETE;
@@ -7830,7 +7825,6 @@ ctl_report_supported_tmf(struct ctl_scsi
int
ctl_report_timestamp(struct ctl_scsiio *ctsio)
{
- struct ctl_lun *lun;
struct scsi_report_timestamp *cdb;
struct scsi_report_timestamp_data *data;
struct timeval tv;
@@ -7841,7 +7835,6 @@ ctl_report_timestamp(struct ctl_scsiio *
CTL_DEBUG_PRINT(("ctl_report_timestamp\n"));
cdb = (struct scsi_report_timestamp *)ctsio->cdb;
- lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
retval = CTL_RETVAL_COMPLETE;
@@ -9845,15 +9838,9 @@ no_sense:
int
ctl_tur(struct ctl_scsiio *ctsio)
{
- struct ctl_lun *lun;
-
- lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
CTL_DEBUG_PRINT(("ctl_tur\n"));
- if (lun == NULL)
- return (EINVAL);
-
ctsio->scsi_status = SCSI_STATUS_OK;
ctsio->io_hdr.status = CTL_SUCCESS;
@@ -10522,10 +10509,8 @@ static int
ctl_inquiry_evpd(struct ctl_scsiio *ctsio)
{
struct scsi_inquiry *cdb;
- struct ctl_lun *lun;
int alloc_len, retval;
- lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
cdb = (struct scsi_inquiry *)ctsio->cdb;
retval = CTL_RETVAL_COMPLETE;
More information about the svn-src-head
mailing list