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

Commit f80d2f08 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: target/core: Remove the write_pending_status() callback function 



Due to the patch that makes TMF handling synchronous the
write_pending_status() callback function is no longer called.  Hence remove
it.

Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Reviewed-by: default avatarSagi Grimberg <sagig@mellanox.com>
Reviewed-by: default avatarAndy Grover <agrover@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarBryant G. Ly <bryantly@linux.vnet.ibm.com>
Cc: Nicholas Bellinger <nab@linux-iscsi.org>
Cc: Mike Christie <mchristi@redhat.com>
Cc: Himanshu Madhani <himanshu.madhani@qlogic.com>
Cc: Quinn Tran <quinn.tran@qlogic.com>
Cc: Saurav Kashyap <saurav.kashyap@qlogic.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent e18e9dac

Documentation/target/tcm_mod_builder.py

+0 −8
Original line number Diff line number Diff line
@@ -297,7 +297,6 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "	.sess_get_index			= " + fabric_mod_name + "_sess_get_index,\n"

	buf += "	.sess_get_initiator_sid		= NULL,\n"

	buf += "	.write_pending			= " + fabric_mod_name + "_write_pending,\n"

	buf += "	.write_pending_status		= " + fabric_mod_name + "_write_pending_status,\n"

	buf += "	.set_default_node_attributes	= " + fabric_mod_name + "_set_default_node_attrs,\n"

	buf += "	.get_cmd_state			= " + fabric_mod_name + "_get_cmd_state,\n"

	buf += "	.queue_data_in			= " + fabric_mod_name + "_queue_data_in,\n"
@@ -479,13 +478,6 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
			buf += "}\n\n"

			bufi += "int " + fabric_mod_name + "_write_pending(struct se_cmd *);\n"



		if re.search('write_pending_status\)\(', fo):

			buf += "int " + fabric_mod_name + "_write_pending_status(struct se_cmd *se_cmd)\n"

			buf += "{\n"

			buf += "	return 0;\n"

			buf += "}\n\n"

			bufi += "int " + fabric_mod_name + "_write_pending_status(struct se_cmd *);\n"



		if re.search('set_default_node_attributes\)\(', fo):

			buf += "void " + fabric_mod_name + "_set_default_node_attrs(struct se_node_acl *nacl)\n"

			buf += "{\n"

drivers/infiniband/ulp/srpt/ib_srpt.c

+0 −9
Original line number Diff line number Diff line
@@ -2703,14 +2703,6 @@ static int srpt_rdma_cm_handler(struct rdma_cm_id *cm_id, 
	return ret;

}



static int srpt_write_pending_status(struct se_cmd *se_cmd)

{

	struct srpt_send_ioctx *ioctx;



	ioctx = container_of(se_cmd, struct srpt_send_ioctx, cmd);

	return ioctx->state == SRPT_STATE_NEED_DATA;

}



/*

 * srpt_write_pending - Start data transfer from initiator to target (write).

 */
@@ -3806,7 +3798,6 @@ static const struct target_core_fabric_ops srpt_template = { 
	.sess_get_index			= srpt_sess_get_index,

	.sess_get_initiator_sid		= NULL,

	.write_pending			= srpt_write_pending,

	.write_pending_status		= srpt_write_pending_status,

	.set_default_node_attributes	= srpt_set_default_node_attrs,

	.get_cmd_state			= srpt_get_tcm_cmd_state,

	.queue_data_in			= srpt_queue_data_in,

drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c

+0 −6
Original line number Diff line number Diff line
@@ -3788,11 +3788,6 @@ static int ibmvscsis_write_pending(struct se_cmd *se_cmd) 
	return 0;

}



static int ibmvscsis_write_pending_status(struct se_cmd *se_cmd)

{

	return 0;

}



static void ibmvscsis_set_default_node_attrs(struct se_node_acl *nacl)

{

}
@@ -4053,7 +4048,6 @@ static const struct target_core_fabric_ops ibmvscsis_ops = { 
	.release_cmd			= ibmvscsis_release_cmd,

	.sess_get_index			= ibmvscsis_sess_get_index,

	.write_pending			= ibmvscsis_write_pending,

	.write_pending_status		= ibmvscsis_write_pending_status,

	.set_default_node_attributes	= ibmvscsis_set_default_node_attrs,

	.get_cmd_state			= ibmvscsis_get_cmd_state,

	.queue_data_in			= ibmvscsis_queue_data_in,

drivers/scsi/qla2xxx/tcm_qla2xxx.c

+0 −31
Original line number Diff line number Diff line
@@ -420,26 +420,6 @@ static int tcm_qla2xxx_write_pending(struct se_cmd *se_cmd) 
	return qlt_rdy_to_xfer(cmd);

}



static int tcm_qla2xxx_write_pending_status(struct se_cmd *se_cmd)

{

	unsigned long flags;

	/*

	 * Check for WRITE_PENDING status to determine if we need to wait for

	 * CTIO aborts to be posted via hardware in tcm_qla2xxx_handle_data().

	 */

	spin_lock_irqsave(&se_cmd->t_state_lock, flags);

	if (se_cmd->t_state == TRANSPORT_WRITE_PENDING ||

	    se_cmd->t_state == TRANSPORT_COMPLETE_QF_WP) {

		spin_unlock_irqrestore(&se_cmd->t_state_lock, flags);

		wait_for_completion_timeout(&se_cmd->t_transport_stop_comp,

						50);

		return 0;

	}

	spin_unlock_irqrestore(&se_cmd->t_state_lock, flags);



	return 0;

}



static void tcm_qla2xxx_set_default_node_attrs(struct se_node_acl *nacl)

{

	return;
@@ -537,15 +517,6 @@ static void tcm_qla2xxx_handle_data_work(struct work_struct *work) 


	cmd->qpair->tgt_counters.qla_core_ret_ctio++;

	if (!cmd->write_data_transferred) {

		/*

		 * Check if se_cmd has already been aborted via LUN_RESET, and

		 * waiting upon completion in tcm_qla2xxx_write_pending_status()

		 */

		if (cmd->se_cmd.transport_state & CMD_T_ABORTED) {

			complete(&cmd->se_cmd.t_transport_stop_comp);

			return;

		}



		switch (cmd->dif_err_code) {

		case DIF_ERR_GRD:

			cmd->se_cmd.pi_err =
@@ -1902,7 +1873,6 @@ static const struct target_core_fabric_ops tcm_qla2xxx_ops = { 
	.sess_get_index			= tcm_qla2xxx_sess_get_index,

	.sess_get_initiator_sid		= NULL,

	.write_pending			= tcm_qla2xxx_write_pending,

	.write_pending_status		= tcm_qla2xxx_write_pending_status,

	.set_default_node_attributes	= tcm_qla2xxx_set_default_node_attrs,

	.get_cmd_state			= tcm_qla2xxx_get_cmd_state,

	.queue_data_in			= tcm_qla2xxx_queue_data_in,
@@ -1943,7 +1913,6 @@ static const struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = { 
	.sess_get_index			= tcm_qla2xxx_sess_get_index,

	.sess_get_initiator_sid		= NULL,

	.write_pending			= tcm_qla2xxx_write_pending,

	.write_pending_status		= tcm_qla2xxx_write_pending_status,

	.set_default_node_attributes	= tcm_qla2xxx_set_default_node_attrs,

	.get_cmd_state			= tcm_qla2xxx_get_cmd_state,

	.queue_data_in			= tcm_qla2xxx_queue_data_in,

drivers/target/iscsi/iscsi_target_configfs.c

+0 −13
Original line number Diff line number Diff line
@@ -1389,18 +1389,6 @@ static int lio_write_pending(struct se_cmd *se_cmd) 
	return 0;

}



static int lio_write_pending_status(struct se_cmd *se_cmd)

{

	struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd);

	int ret;



	spin_lock_bh(&cmd->istate_lock);

	ret = !(cmd->cmd_flags & ICF_GOT_LAST_DATAOUT);

	spin_unlock_bh(&cmd->istate_lock);



	return ret;

}



static int lio_queue_status(struct se_cmd *se_cmd)

{

	struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd);
@@ -1564,7 +1552,6 @@ const struct target_core_fabric_ops iscsi_ops = { 
	.sess_get_index			= lio_sess_get_index,

	.sess_get_initiator_sid		= lio_sess_get_initiator_sid,

	.write_pending			= lio_write_pending,

	.write_pending_status		= lio_write_pending_status,

	.set_default_node_attributes	= lio_set_default_node_attributes,

	.get_cmd_state			= iscsi_get_cmd_state,

	.queue_data_in			= lio_queue_data_in,