From a5e7f17b8878c1cc383bc8cb1eb9fe37a136eba6 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Tue, 19 Jun 2018 11:38:46 +0900 Subject: [PATCH] iscsi: Remove duplicated check of scsi status in spdk_iscsi_transfer_in if the scsi status of the task is not GOOD, iscsi_transfer_in() returns immediately. Hence checking it again is not necesasry. Change-Id: I55cb025e97c8dcd51692303d0d21ce48b1185631 Signed-off-by: Shuhei Matsumoto Reviewed-on: https://review.gerrithub.io/416315 Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp Reviewed-by: Jim Harris Reviewed-by: Dariusz Stojaczyk Reviewed-by: Ziye Yang Reviewed-by: Ben Walker --- lib/iscsi/iscsi.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/lib/iscsi/iscsi.c b/lib/iscsi/iscsi.c index a0f38bf7a..ca0f7b8c4 100644 --- a/lib/iscsi/iscsi.c +++ b/lib/iscsi/iscsi.c @@ -2759,18 +2759,11 @@ spdk_iscsi_transfer_in(struct spdk_iscsi_conn *conn, datain_flag |= ISCSI_FLAG_FINAL; datain_flag &= ~ISCSI_DATAIN_STATUS; if (task->scsi.sense_data_len == 0) { - switch (task->scsi.status) { - case SPDK_SCSI_STATUS_GOOD: - case SPDK_SCSI_STATUS_CONDITION_MET: - case SPDK_SCSI_STATUS_INTERMEDIATE: - case SPDK_SCSI_STATUS_INTERMEDIATE_CONDITION_MET: - /* The last pdu in all data-in pdus */ - if ((offset + len) == transfer_len && - (primary->bytes_completed == - primary->scsi.transfer_len)) { - datain_flag |= ISCSI_DATAIN_STATUS; - sent_status = 1; - } + /* The last pdu in all data-in pdus */ + if ((offset + len) == transfer_len && + (primary->bytes_completed == primary->scsi.transfer_len)) { + datain_flag |= ISCSI_DATAIN_STATUS; + sent_status = 1; } } } else {