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

Commit 67c33346 authored by Bart Van Assche's avatar Bart Van Assche Committed by Greg Kroah-Hartman
Browse files

scsi: Revert "target: iscsi: Wait for all commands to finish before freeing a session" 

commit 807b9515b7d044cf77df31f1af9d842a76ecd5cb upstream.

Since commit e9d3009cb936 introduced a regression and since the fix for
that regression was not perfect, revert this commit.

Link: https://marc.info/?l=target-devel&m=158157054906195


Cc: Rahul Kundu <rahul.kundu@chelsio.com>
Cc: Mike Marciniszyn <mike.marciniszyn@intel.com>
Cc: Sagi Grimberg <sagi@grimberg.me>
Reported-by: default avatarDakshaja Uppalapati <dakshaja@chelsio.com>
Fixes: e9d3009cb936 ("scsi: target: iscsi: Wait for all commands to finish before freeing a session")
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 78472fe3

drivers/target/iscsi/iscsi_target.c

+2 −8
Original line number Diff line number Diff line
@@ -1168,9 +1168,7 @@ int iscsit_setup_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, 
		hdr->cmdsn, be32_to_cpu(hdr->data_length), payload_length,

		conn->cid);



	if (target_get_sess_cmd(&cmd->se_cmd, true) < 0)

		return iscsit_add_reject_cmd(cmd,

				ISCSI_REASON_WAITING_FOR_LOGOUT, buf);

	target_get_sess_cmd(&cmd->se_cmd, true);



	cmd->sense_reason = transport_lookup_cmd_lun(&cmd->se_cmd,

						     scsilun_to_int(&hdr->lun));
@@ -1988,9 +1986,7 @@ iscsit_handle_task_mgt_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, 
			      conn->sess->se_sess, 0, DMA_NONE,

			      TCM_SIMPLE_TAG, cmd->sense_buffer + 2);



	if (target_get_sess_cmd(&cmd->se_cmd, true) < 0)

		return iscsit_add_reject_cmd(cmd,

				ISCSI_REASON_WAITING_FOR_LOGOUT, buf);

	target_get_sess_cmd(&cmd->se_cmd, true);



	/*

	 * TASK_REASSIGN for ERL=2 / connection stays inside of
@@ -4247,8 +4243,6 @@ int iscsit_close_connection( 
	 * must wait until they have completed.

	 */

	iscsit_check_conn_usage_count(conn);

	target_sess_cmd_list_set_waiting(sess->se_sess);

	target_wait_for_sess_cmds(sess->se_sess);



	ahash_request_free(conn->conn_tx_hash);

	if (conn->conn_rx_hash) {

include/scsi/iscsi_proto.h

+0 −1
Original line number Diff line number Diff line
@@ -638,7 +638,6 @@ struct iscsi_reject { 
#define ISCSI_REASON_BOOKMARK_INVALID	9

#define ISCSI_REASON_BOOKMARK_NO_RESOURCES	10

#define ISCSI_REASON_NEGOTIATION_RESET	11

#define ISCSI_REASON_WAITING_FOR_LOGOUT	12



/* Max. number of Key=Value pairs in a text message */

#define MAX_KEY_VALUE_PAIRS	8192