target/core: Remove the write_pending_status() callback function
Subsystems (13)
Bart Van Assche
maintainerPATCH 1/16 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.
--- Documentation/target/tcm_mod_builder.py | 8 ----- drivers/infiniband/ulp/srpt/ib_srpt.c | 9 ------ drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 6 ---- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 31 -------------------- drivers/target/iscsi/iscsi_target_configfs.c | 13 -------- drivers/target/loopback/tcm_loop.c | 6 ---- drivers/target/sbp/sbp_target.c | 6 ---- drivers/target/target_core_configfs.c | 4 --- drivers/target/target_core_xcopy.c | 6 ---- drivers/target/tcm_fc/tcm_fc.h | 1 - drivers/target/tcm_fc/tfc_cmd.c | 7 ----- drivers/target/tcm_fc/tfc_conf.c | 1 - drivers/usb/gadget/function/f_tcm.c | 9 ------ drivers/vhost/scsi.c | 6 ---- drivers/xen/xen-scsiback.c | 6 ---- include/target/target_core_fabric.h | 1 - 16 files changed, 120 deletions(-)
Documentation/target/tcm_mod_builder.py +0 -8
@@ -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
@@ -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
@@ -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 -29
@@ -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
@@ -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,
drivers/target/loopback/tcm_loop.c +0 -6
@@ -560,11 +560,6 @@ static int tcm_loop_write_pending(struct se_cmd *se_cmd)return 0 ; } -static int tcm_loop_write_pending_status (struct se_cmd *se_cmd) -{ -return 0 ; -} -static int tcm_loop_queue_data_in (struct se_cmd *se_cmd) { struct tcm_loop_cmd *tl_cmd = container_of(se_cmd,
@@ -1159,7 +1154,6 @@ static const struct target_core_fabric_ops loop_ops = { .release_cmd = tcm_loop_release_cmd, .sess_get_index = tcm_loop_sess_get_index, .write_pending = tcm_loop_write_pending, - .write_pending_status = tcm_loop_write_pending_status, .set_default_node_attributes = tcm_loop_set_default_node_attributes, .get_cmd_state = tcm_loop_get_cmd_state, .queue_data_in = tcm_loop_queue_data_in,
drivers/target/sbp/sbp_target.c +0 -6
@@ -1749,11 +1749,6 @@ static int sbp_write_pending(struct se_cmd *se_cmd)return 0 ; } -static int sbp_write_pending_status (struct se_cmd *se_cmd) -{ -return 0 ; -} -static void sbp_set_default_node_attrs (struct se_node_acl *nacl) {return ;
@@ -2329,7 +2324,6 @@ static const struct target_core_fabric_ops sbp_ops = { .release_cmd = sbp_release_cmd, .sess_get_index = sbp_sess_get_index, .write_pending = sbp_write_pending, - .write_pending_status = sbp_write_pending_status, .set_default_node_attributes = sbp_set_default_node_attrs, .get_cmd_state = sbp_get_cmd_state, .queue_data_in = sbp_queue_data_in,
drivers/target/target_core_configfs.c +0 -4
@@ -401,10 +401,6 @@ static int target_fabric_tf_ops_check(const struct target_core_fabric_ops *tfo)pr_err ("Missing tfo->write_pending()\n" );return -EINVAL ; } -if (!tfo->write_pending_status) { -pr_err ("Missing tfo->write_pending_status()\n" ); -return -EINVAL ; - }if (!tfo->set_default_node_attributes) {pr_err ("Missing tfo->set_default_node_attributes()\n" );return -EINVAL ;
drivers/target/target_core_xcopy.c +0 -6
@@ -442,11 +442,6 @@ static int xcopy_pt_write_pending(struct se_cmd *se_cmd)return 0 ; } -static int xcopy_pt_write_pending_status (struct se_cmd *se_cmd) -{ -return 0 ; -} -static int xcopy_pt_queue_data_in (struct se_cmd *se_cmd) {return 0 ;
@@ -463,7 +458,6 @@ static const struct target_core_fabric_ops xcopy_pt_tfo = { .release_cmd = xcopy_pt_release_cmd, .check_stop_free = xcopy_pt_check_stop_free, .write_pending = xcopy_pt_write_pending, - .write_pending_status = xcopy_pt_write_pending_status, .queue_data_in = xcopy_pt_queue_data_in, .queue_status = xcopy_pt_queue_status, };
drivers/target/tcm_fc/tcm_fc.h +0 -1
@@ -158,7 +158,6 @@ void ft_release_cmd(struct se_cmd *);int ft_queue_status (struct se_cmd *);int ft_queue_data_in (struct se_cmd *);int ft_write_pending (struct se_cmd *); -int ft_write_pending_status (struct se_cmd *);int ft_get_cmd_state (struct se_cmd *);void ft_queue_tm_resp (struct se_cmd *);void ft_aborted_task (struct se_cmd *);
drivers/target/tcm_fc/tfc_cmd.c +0 -7
@@ -184,13 +184,6 @@ int ft_queue_status(struct se_cmd *se_cmd)return 0 ; } -int ft_write_pending_status (struct se_cmd *se_cmd) -{ - struct ft_cmd *cmd = container_of(se_cmd, struct ft_cmd, se_cmd); - -return cmd->write_data_len != se_cmd->data_length; -} -/* * Send TX_RDY (transfer ready). */
drivers/target/tcm_fc/tfc_conf.c +0 -1
@@ -437,7 +437,6 @@ static const struct target_core_fabric_ops ft_fabric_ops = { .sess_get_index = ft_sess_get_index, .sess_get_initiator_sid = NULL, .write_pending = ft_write_pending, - .write_pending_status = ft_write_pending_status, .set_default_node_attributes = ft_set_default_node_attr, .get_cmd_state = ft_get_cmd_state, .queue_data_in = ft_queue_data_in,
drivers/usb/gadget/function/f_tcm.c +0 -9
@@ -1292,14 +1292,6 @@ static u32 usbg_sess_get_index(struct se_session *se_sess)return 0 ; } -/* -* XXX Error recovery: return != 0 if we expect writes. Dunno when that could be -*/ -static int usbg_write_pending_status (struct se_cmd *se_cmd) -{ -return 0 ; -} -static void usbg_set_default_node_attrs (struct se_node_acl *nacl) { }
@@ -1725,7 +1717,6 @@ static const struct target_core_fabric_ops usbg_ops = { .sess_get_index = usbg_sess_get_index, .sess_get_initiator_sid = NULL, .write_pending = usbg_send_write_request, - .write_pending_status = usbg_write_pending_status, .set_default_node_attributes = usbg_set_default_node_attrs, .get_cmd_state = usbg_get_cmd_state, .queue_data_in = usbg_send_read_response,
drivers/vhost/scsi.c +0 -6
@@ -346,11 +346,6 @@ static int vhost_scsi_write_pending(struct se_cmd *se_cmd)return 0 ; } -static int vhost_scsi_write_pending_status (struct se_cmd *se_cmd) -{ -return 0 ; -} -static void vhost_scsi_set_default_node_attrs (struct se_node_acl *nacl) {return ;
@@ -2298,7 +2293,6 @@ static const struct target_core_fabric_ops vhost_scsi_ops = { .sess_get_index = vhost_scsi_sess_get_index, .sess_get_initiator_sid = NULL, .write_pending = vhost_scsi_write_pending, - .write_pending_status = vhost_scsi_write_pending_status, .set_default_node_attributes = vhost_scsi_set_default_node_attrs, .get_cmd_state = vhost_scsi_get_cmd_state, .queue_data_in = vhost_scsi_queue_data_in,
drivers/xen/xen-scsiback.c +0 -6
@@ -1404,11 +1404,6 @@ static int scsiback_write_pending(struct se_cmd *se_cmd)return 0 ; } -static int scsiback_write_pending_status (struct se_cmd *se_cmd) -{ -return 0 ; -} -static void scsiback_set_default_node_attrs (struct se_node_acl *nacl) { }
@@ -1818,7 +1813,6 @@ static const struct target_core_fabric_ops scsiback_ops = { .sess_get_index = scsiback_sess_get_index, .sess_get_initiator_sid = NULL, .write_pending = scsiback_write_pending, - .write_pending_status = scsiback_write_pending_status, .set_default_node_attributes = scsiback_set_default_node_attrs, .get_cmd_state = scsiback_get_cmd_state, .queue_data_in = scsiback_queue_data_in,
include/target/target_core_fabric.h +0 -1
@@ -74,7 +74,6 @@ struct target_core_fabric_ops {u32 (*sess_get_initiator_sid)(struct se_session *,unsigned char *,u32 );int (*write_pending)(struct se_cmd *); -int (*write_pending_status)(struct se_cmd *);void (*set_default_node_attributes)(struct se_node_acl *);int (*get_cmd_state)(struct se_cmd *);int (*queue_data_in)(struct se_cmd *);
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog