d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iscsi: Refactor update of datain_flag in spdk_iscsi_transfer_in()

Browse Source 
Change-Id: I17c52c6620500959ada0783ef115c62b22c574f0
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/416316
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Shuhei Matsumoto 2018-06-19 11:39:53 +09:00 committed by Ben Walker
parent a5e7f17b88
commit 0ba0bbd132
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/iscsi/iscsi.c
View File

@ -2714,7 +2714,7 @@ spdk_iscsi_transfer_in(struct spdk_iscsi_conn *conn,
}
} else {
/* handle the case that it is a primary task which has subtasks */
if (primary->scsi.transfer_len != task->scsi.length) {
if (primary->scsi.transfer_len != primary->scsi.length) {
conn->data_in_cnt--;
}
}
@ -2747,17 +2747,17 @@ spdk_iscsi_transfer_in(struct spdk_iscsi_conn *conn,
offset = i * conn->sess->MaxBurstLength;
sequence_end = DMIN32(((i + 1) * conn->sess->MaxBurstLength),
transfer_len);
datain_flag &= ~ISCSI_FLAG_FINAL;
datain_flag &= ~ISCSI_DATAIN_STATUS;
/* send data splitted by segment_len */
for (; offset < sequence_end; offset += segment_len) {
len = DMIN32(segment_len, (sequence_end - offset));
datain_flag &= ~ISCSI_FLAG_FINAL;
datain_flag &= ~ISCSI_DATAIN_STATUS;
if (offset + len == sequence_end) {
/* last PDU in a sequence */
datain_flag |= ISCSI_FLAG_FINAL;
datain_flag &= ~ISCSI_DATAIN_STATUS;
if (task->scsi.sense_data_len == 0) {
/* The last pdu in all data-in pdus */
if ((offset + len) == transfer_len &&
@ -2766,9 +2766,6 @@ spdk_iscsi_transfer_in(struct spdk_iscsi_conn *conn,
sent_status = 1;
}
}
} else {
datain_flag &= ~ISCSI_FLAG_FINAL;
datain_flag &= ~ISCSI_DATAIN_STATUS;
}
SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "Transfer=%d, Offset=%d, Len=%d\n",