aboutsummaryrefslogtreecommitdiff
path: root/sys/cam/ctl
diff options
context:
space:
mode:
authorAlexander Motin <mav@FreeBSD.org>2020-05-28 23:55:46 +0000
committerAlexander Motin <mav@FreeBSD.org>2020-05-28 23:55:46 +0000
commit30a31f6c71676b7fb17eeba99db4f0a01aadb978 (patch)
tree6cb28f8315c0fa1766ebfda2981204916ec94447 /sys/cam/ctl
parentc5ea81f7a6786e7398678551e7d26d5b628c4caa (diff)
downloadsrc-30a31f6c71676b7fb17eeba99db4f0a01aadb978.tar.gz
src-30a31f6c71676b7fb17eeba99db4f0a01aadb978.zip
Remove PDU_TOTAL_TRANSFER_LEN() macro.
I don't see a point to copy io->scsiio.kern_total_len into the request PDU private field. The io is going to stay with us till the end, and kern_total_len field is not changed after being first initialized. MFC after: 2 weeks Sponsored by: iXsystems, Inc.
Notes
Notes: svn path=/head/; revision=361609
Diffstat (limited to 'sys/cam/ctl')
-rw-r--r--sys/cam/ctl/ctl_frontend_iscsi.c31
1 files changed, 8 insertions, 23 deletions
diff --git a/sys/cam/ctl/ctl_frontend_iscsi.c b/sys/cam/ctl/ctl_frontend_iscsi.c
index 9e3e82c579d0..6e003518963a 100644
--- a/sys/cam/ctl/ctl_frontend_iscsi.c
+++ b/sys/cam/ctl/ctl_frontend_iscsi.c
@@ -144,7 +144,6 @@ SYSCTL_INT(_kern_cam_ctl_iscsi, OID_AUTO, maxtags, CTLFLAG_RWTUN,
#define CONN_SESSION(X) ((struct cfiscsi_session *)(X)->ic_prv0)
#define PDU_SESSION(X) CONN_SESSION((X)->ip_conn)
#define PDU_EXPDATASN(X) (X)->ip_prv0
-#define PDU_TOTAL_TRANSFER_LEN(X) (X)->ip_prv1
#define PDU_R2TSN(X) (X)->ip_prv2
static int cfiscsi_init(void);
@@ -2446,13 +2445,6 @@ cfiscsi_datamove_in(union ctl_io *io)
}
/*
- * This is the total amount of data to be transferred within the current
- * SCSI command. We need to record it so that we can properly report
- * underflow/underflow.
- */
- PDU_TOTAL_TRANSFER_LEN(request) = io->scsiio.kern_total_len;
-
- /*
* This is the offset within the current SCSI command; for the first
* call to cfiscsi_datamove() it will be 0, and for subsequent ones
* it will be the sum of lengths of previous ones.
@@ -2611,17 +2603,17 @@ cfiscsi_datamove_in(union ctl_io *io)
bhsdi->bhsdi_flags |= BHSDI_FLAGS_F;
if (io->io_hdr.status == CTL_SUCCESS) {
bhsdi->bhsdi_flags |= BHSDI_FLAGS_S;
- if (PDU_TOTAL_TRANSFER_LEN(request) <
+ if (io->scsiio.kern_total_len <
ntohl(bhssc->bhssc_expected_data_transfer_length)) {
bhsdi->bhsdi_flags |= BHSSR_FLAGS_RESIDUAL_UNDERFLOW;
bhsdi->bhsdi_residual_count =
htonl(ntohl(bhssc->bhssc_expected_data_transfer_length) -
- PDU_TOTAL_TRANSFER_LEN(request));
- } else if (PDU_TOTAL_TRANSFER_LEN(request) >
+ io->scsiio.kern_total_len);
+ } else if (io->scsiio.kern_total_len >
ntohl(bhssc->bhssc_expected_data_transfer_length)) {
bhsdi->bhsdi_flags |= BHSSR_FLAGS_RESIDUAL_OVERFLOW;
bhsdi->bhsdi_residual_count =
- htonl(PDU_TOTAL_TRANSFER_LEN(request) -
+ htonl(io->scsiio.kern_total_len -
ntohl(bhssc->bhssc_expected_data_transfer_length));
}
bhsdi->bhsdi_status = io->scsiio.scsi_status;
@@ -2657,12 +2649,6 @@ cfiscsi_datamove_out(union ctl_io *io)
("bhssc->bhssc_opcode != ISCSI_BHS_OPCODE_SCSI_COMMAND"));
/*
- * We need to record it so that we can properly report
- * underflow/underflow.
- */
- PDU_TOTAL_TRANSFER_LEN(request) = io->scsiio.kern_total_len;
-
- /*
* Complete write underflow. Not a single byte to read. Return.
*/
expected_len = ntohl(bhssc->bhssc_expected_data_transfer_length);
@@ -2851,19 +2837,18 @@ cfiscsi_scsi_command_done(union ctl_io *io)
* XXX: We don't deal with bidirectional under/overflows;
* does anything actually support those?
*/
- if (PDU_TOTAL_TRANSFER_LEN(request) <
+ if (io->scsiio.kern_total_len <
ntohl(bhssc->bhssc_expected_data_transfer_length)) {
bhssr->bhssr_flags |= BHSSR_FLAGS_RESIDUAL_UNDERFLOW;
bhssr->bhssr_residual_count =
htonl(ntohl(bhssc->bhssc_expected_data_transfer_length) -
- PDU_TOTAL_TRANSFER_LEN(request));
+ io->scsiio.kern_total_len);
//CFISCSI_SESSION_DEBUG(cs, "underflow; residual count %d",
// ntohl(bhssr->bhssr_residual_count));
- } else if (PDU_TOTAL_TRANSFER_LEN(request) >
+ } else if (io->scsiio.kern_total_len >
ntohl(bhssc->bhssc_expected_data_transfer_length)) {
bhssr->bhssr_flags |= BHSSR_FLAGS_RESIDUAL_OVERFLOW;
- bhssr->bhssr_residual_count =
- htonl(PDU_TOTAL_TRANSFER_LEN(request) -
+ bhssr->bhssr_residual_count = htonl(io->scsiio.kern_total_len -
ntohl(bhssc->bhssc_expected_data_transfer_length));
//CFISCSI_SESSION_DEBUG(cs, "overflow; residual count %d",
// ntohl(bhssr->bhssr_residual_count));