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

Commit afc16604 authored by Bart Van Assche's avatar Bart Van Assche Committed by Nicholas Bellinger
Browse files

target: Remove first argument of target_{get,put}_sess_cmd() 



The first argument of these two functions is always identical
to se_cmd->se_sess. Hence remove the first argument.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarSagi Grimberg <sagig@mellanox.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Andy Grover <agrover@redhat.com>
Cc: <qla2xxx-upstream@qlogic.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent e4648b01

drivers/infiniband/ulp/isert/ib_isert.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1332,7 +1332,7 @@ sequence_cmd: 
	if (!rc && dump_payload == false && unsol_data)

	if (!rc && dump_payload == false && unsol_data)

		iscsit_set_unsoliticed_dataout(cmd);

		iscsit_set_unsoliticed_dataout(cmd);

	else if (dump_payload && imm_data)

	else if (dump_payload && imm_data)

		target_put_sess_cmd(conn->sess->se_sess, &cmd->se_cmd);

		target_put_sess_cmd(&cmd->se_cmd);





	return 0;

	return 0;

}

}
@@ -1757,7 +1757,7 @@ isert_put_cmd(struct isert_cmd *isert_cmd, bool comp_err) 
			    cmd->se_cmd.t_state == TRANSPORT_WRITE_PENDING) {

			    cmd->se_cmd.t_state == TRANSPORT_WRITE_PENDING) {

				struct se_cmd *se_cmd = &cmd->se_cmd;

				struct se_cmd *se_cmd = &cmd->se_cmd;





				target_put_sess_cmd(se_cmd->se_sess, se_cmd);

				target_put_sess_cmd(se_cmd);

			}

			}

		}

		}
@@ -1930,7 +1930,7 @@ isert_completion_rdma_read(struct iser_tx_desc *tx_desc, 
	spin_unlock_bh(&cmd->istate_lock);

	spin_unlock_bh(&cmd->istate_lock);





	if (ret) {

	if (ret) {

		target_put_sess_cmd(se_cmd->se_sess, se_cmd);

		target_put_sess_cmd(se_cmd);

		transport_send_check_condition_and_sense(se_cmd,

		transport_send_check_condition_and_sense(se_cmd,

							 se_cmd->pi_err, 0);

							 se_cmd->pi_err, 0);

	} else {

	} else {

drivers/infiniband/ulp/srpt/ib_srpt.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -1334,7 +1334,7 @@ static int srpt_abort_cmd(struct srpt_send_ioctx *ioctx) 




		BUG_ON(ch->sess == NULL);

		BUG_ON(ch->sess == NULL);





		target_put_sess_cmd(ch->sess, &ioctx->cmd);

		target_put_sess_cmd(&ioctx->cmd);

		goto out;

		goto out;

	}

	}
@@ -1365,11 +1365,11 @@ static int srpt_abort_cmd(struct srpt_send_ioctx *ioctx) 
		 * not been received in time.

		 * not been received in time.

		 */

		 */

		srpt_unmap_sg_to_ib_sge(ioctx->ch, ioctx);

		srpt_unmap_sg_to_ib_sge(ioctx->ch, ioctx);

		target_put_sess_cmd(ioctx->ch->sess, &ioctx->cmd);

		target_put_sess_cmd(&ioctx->cmd);

		break;

		break;

	case SRPT_STATE_MGMT_RSP_SENT:

	case SRPT_STATE_MGMT_RSP_SENT:

		srpt_set_cmd_state(ioctx, SRPT_STATE_DONE);

		srpt_set_cmd_state(ioctx, SRPT_STATE_DONE);

		target_put_sess_cmd(ioctx->ch->sess, &ioctx->cmd);

		target_put_sess_cmd(&ioctx->cmd);

		break;

		break;

	default:

	default:

		WARN(1, "Unexpected command state (%d)", state);

		WARN(1, "Unexpected command state (%d)", state);
@@ -1679,7 +1679,7 @@ static int srpt_check_stop_free(struct se_cmd *cmd) 
	struct srpt_send_ioctx *ioctx = container_of(cmd,

	struct srpt_send_ioctx *ioctx = container_of(cmd,

				struct srpt_send_ioctx, cmd);

				struct srpt_send_ioctx, cmd);





	return target_put_sess_cmd(ioctx->ch->sess, &ioctx->cmd);

	return target_put_sess_cmd(&ioctx->cmd);

}

}





/**

/**
@@ -3074,7 +3074,7 @@ static void srpt_queue_response(struct se_cmd *cmd) 
		       ioctx->tag);

		       ioctx->tag);

		srpt_unmap_sg_to_ib_sge(ch, ioctx);

		srpt_unmap_sg_to_ib_sge(ch, ioctx);

		srpt_set_cmd_state(ioctx, SRPT_STATE_DONE);

		srpt_set_cmd_state(ioctx, SRPT_STATE_DONE);

		target_put_sess_cmd(ioctx->ch->sess, &ioctx->cmd);

		target_put_sess_cmd(&ioctx->cmd);

	}

	}

}

}

drivers/scsi/qla2xxx/tcm_qla2xxx.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -429,7 +429,7 @@ static int tcm_qla2xxx_check_stop_free(struct se_cmd *se_cmd) 
		cmd->cmd_flags |= BIT_14;

		cmd->cmd_flags |= BIT_14;

	}

	}





	return target_put_sess_cmd(se_cmd->se_sess, se_cmd);

	return target_put_sess_cmd(se_cmd);

}

}





/* tcm_qla2xxx_release_cmd - Callback from TCM Core to release underlying

/* tcm_qla2xxx_release_cmd - Callback from TCM Core to release underlying

drivers/target/iscsi/iscsi_target.c

+7 −8
Original line number Original line Diff line number Diff line
@@ -715,7 +715,7 @@ static int iscsit_add_reject_from_cmd( 
	 */

	 */

	if (cmd->se_cmd.se_tfo != NULL) {

	if (cmd->se_cmd.se_tfo != NULL) {

		pr_debug("iscsi reject: calling target_put_sess_cmd >>>>>>\n");

		pr_debug("iscsi reject: calling target_put_sess_cmd >>>>>>\n");

		target_put_sess_cmd(conn->sess->se_sess, &cmd->se_cmd);

		target_put_sess_cmd(&cmd->se_cmd);

	}

	}

	return -1;

	return -1;

}

}
@@ -1001,7 +1001,7 @@ int iscsit_setup_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, 
		hdr->cmdsn, be32_to_cpu(hdr->data_length), payload_length,

		hdr->cmdsn, be32_to_cpu(hdr->data_length), payload_length,

		conn->cid);

		conn->cid);





	target_get_sess_cmd(conn->sess->se_sess, &cmd->se_cmd, true);

	target_get_sess_cmd(&cmd->se_cmd, true);





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

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

						     scsilun_to_int(&hdr->lun));

						     scsilun_to_int(&hdr->lun));
@@ -1067,7 +1067,7 @@ int iscsit_process_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, 
		if (cmdsn_ret == CMDSN_ERROR_CANNOT_RECOVER)

		if (cmdsn_ret == CMDSN_ERROR_CANNOT_RECOVER)

			return -1;

			return -1;

		else if (cmdsn_ret == CMDSN_LOWER_THAN_EXP) {

		else if (cmdsn_ret == CMDSN_LOWER_THAN_EXP) {

			target_put_sess_cmd(conn->sess->se_sess, &cmd->se_cmd);

			target_put_sess_cmd(&cmd->se_cmd);

			return 0;

			return 0;

		}

		}

	}

	}
@@ -1083,7 +1083,7 @@ int iscsit_process_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, 
		if (!cmd->sense_reason)

		if (!cmd->sense_reason)

			return 0;

			return 0;





		target_put_sess_cmd(conn->sess->se_sess, &cmd->se_cmd);

		target_put_sess_cmd(&cmd->se_cmd);

		return 0;

		return 0;

	}

	}
@@ -1114,7 +1114,6 @@ static int 
iscsit_get_immediate_data(struct iscsi_cmd *cmd, struct iscsi_scsi_req *hdr,

iscsit_get_immediate_data(struct iscsi_cmd *cmd, struct iscsi_scsi_req *hdr,

			  bool dump_payload)

			  bool dump_payload)

{

{

	struct iscsi_conn *conn = cmd->conn;

	int cmdsn_ret = 0, immed_ret = IMMEDIATE_DATA_NORMAL_OPERATION;

	int cmdsn_ret = 0, immed_ret = IMMEDIATE_DATA_NORMAL_OPERATION;

	/*

	/*

	 * Special case for Unsupported SAM WRITE Opcodes and ImmediateData=Yes.

	 * Special case for Unsupported SAM WRITE Opcodes and ImmediateData=Yes.
@@ -1141,7 +1140,7 @@ after_immediate_data: 




			rc = iscsit_dump_data_payload(cmd->conn,

			rc = iscsit_dump_data_payload(cmd->conn,

						      cmd->first_burst_len, 1);

						      cmd->first_burst_len, 1);

			target_put_sess_cmd(conn->sess->se_sess, &cmd->se_cmd);

			target_put_sess_cmd(&cmd->se_cmd);

			return rc;

			return rc;

		} else if (cmd->unsolicited_data)

		} else if (cmd->unsolicited_data)

			iscsit_set_unsoliticed_dataout(cmd);

			iscsit_set_unsoliticed_dataout(cmd);
@@ -1810,7 +1809,7 @@ iscsit_handle_task_mgt_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, 
				      conn->sess->se_sess, 0, DMA_NONE,

				      conn->sess->se_sess, 0, DMA_NONE,

				      TCM_SIMPLE_TAG, cmd->sense_buffer + 2);

				      TCM_SIMPLE_TAG, cmd->sense_buffer + 2);





		target_get_sess_cmd(conn->sess->se_sess, &cmd->se_cmd, true);

		target_get_sess_cmd(&cmd->se_cmd, true);

		sess_ref = true;

		sess_ref = true;





		switch (function) {

		switch (function) {
@@ -1952,7 +1951,7 @@ attach: 
	 */

	 */

	if (sess_ref) {

	if (sess_ref) {

		pr_debug("Handle TMR, using sess_ref=true check\n");

		pr_debug("Handle TMR, using sess_ref=true check\n");

		target_put_sess_cmd(conn->sess->se_sess, &cmd->se_cmd);

		target_put_sess_cmd(&cmd->se_cmd);

	}

	}





	iscsit_add_cmd_to_response_queue(cmd, conn, cmd->i_state);

	iscsit_add_cmd_to_response_queue(cmd, conn, cmd->i_state);

drivers/target/iscsi/iscsi_target_configfs.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1967,7 +1967,7 @@ static void lio_set_default_node_attributes(struct se_node_acl *se_acl) 




static int lio_check_stop_free(struct se_cmd *se_cmd)

static int lio_check_stop_free(struct se_cmd *se_cmd)

{

{

	return target_put_sess_cmd(se_cmd->se_sess, se_cmd);

	return target_put_sess_cmd(se_cmd);

}

}





static void lio_release_cmd(struct se_cmd *se_cmd)

static void lio_release_cmd(struct se_cmd *se_cmd)