Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edbc9aa0 authored by Mike Christie's avatar Mike Christie Committed by James Bottomley
Browse files

[SCSI] libiscsi: have iscsi_data_in_rsp call iscsi_update_cmdsn 



This has iscsi_data_in_rsp call iscsi_update_cmdsn when a pdu is
completed like is done for other pdu's that are don.

For libiscsi_tcp, this means that it calls iscsi_update_cmdsn when
it is handling the pdu internally to only transfer data, but if there is
status then it does not need to call it since the completion handling
will do it.

Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 8f9256ce

drivers/scsi/libiscsi.c

+1 −0
Original line number Diff line number Diff line
@@ -729,6 +729,7 @@ iscsi_data_in_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr, 
	if (!(rhdr->flags & ISCSI_FLAG_DATA_STATUS))

		return;



	iscsi_update_cmdsn(conn->session, (struct iscsi_nopin *)hdr);

	sc->result = (DID_OK << 16) | rhdr->cmd_status;

	conn->exp_statsn = be32_to_cpu(rhdr->statsn) + 1;

	if (rhdr->flags & (ISCSI_FLAG_DATA_UNDERFLOW |

drivers/scsi/libiscsi_tcp.c

+7 −1
Original line number Diff line number Diff line
@@ -473,7 +473,13 @@ static int iscsi_tcp_data_in(struct iscsi_conn *conn, struct iscsi_task *task) 
	int datasn = be32_to_cpu(rhdr->datasn);

	unsigned total_in_length = scsi_in(task->sc)->length;



	/*

	 * lib iscsi will update this in the completion handling if there

	 * is status.

	 */

	if (!(rhdr->flags & ISCSI_FLAG_DATA_STATUS))

		iscsi_update_cmdsn(conn->session, (struct iscsi_nopin*)rhdr);



	if (tcp_conn->in.datalen == 0)

		return 0;