From 22f4e0a12fdcfe06ef1afb26336c9350c0fc2302 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Mon, 21 Oct 2019 18:22:28 +0900 Subject: [PATCH] lib/iscsi: Use cached pdu->data_segment_len throughout in iscsi_pdu_hdr_op_scsi() Data segment length of the PDU is already cached in pdu->data_segment_len. Hence additional caching to the local variable data_len is not necessary. Signed-off-by: Shuhei Matsumoto Change-Id: I1e596999640229b1b0fa85cbdb342b1636af5076 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/471879 Tested-by: SPDK CI Jenkins Reviewed-by: Paul Luse Reviewed-by: Ben Walker Reviewed-by: Jim Harris Reviewed-by: Changpeng Liu --- lib/iscsi/iscsi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/iscsi/iscsi.c b/lib/iscsi/iscsi.c index f54d01b1f..135e81548 100644 --- a/lib/iscsi/iscsi.c +++ b/lib/iscsi/iscsi.c @@ -3382,7 +3382,6 @@ iscsi_pdu_hdr_op_scsi(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu) uint8_t *cdb; uint64_t lun; uint32_t task_tag; - uint32_t data_len; uint32_t transfer_len; int R_bit, W_bit; int lun_i; @@ -3399,7 +3398,6 @@ iscsi_pdu_hdr_op_scsi(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu) W_bit = reqh->write_bit; lun = from_be64(&reqh->lun); task_tag = from_be32(&reqh->itt); - data_len = pdu->data_segment_len; transfer_len = from_be32(&reqh->expected_data_xfer_len); cdb = reqh->cdb; @@ -3465,8 +3463,8 @@ iscsi_pdu_hdr_op_scsi(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu) } /* check the ImmediateData and also pdu->data_segment_len */ - if ((!conn->sess->ImmediateData && (data_len > 0)) || - (data_len > conn->sess->FirstBurstLength)) { + if ((!conn->sess->ImmediateData && (pdu->data_segment_len > 0)) || + (pdu->data_segment_len > conn->sess->FirstBurstLength)) { spdk_iscsi_task_put(task); return iscsi_reject(conn, pdu, ISCSI_REASON_PROTOCOL_ERROR); }