Skip to content

Commit

Permalink
target: remove the always-noop ->new_cmd_failure method
Browse files Browse the repository at this point in the history
Signed-off-by: Christoph Hellwig <[email protected]>
Signed-off-by: Nicholas Bellinger <[email protected]>
  • Loading branch information
Christoph Hellwig authored and Nicholas Bellinger committed Jul 22, 2011
1 parent a1d8b49 commit dc2e652
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 31 deletions.
11 changes: 0 additions & 11 deletions drivers/target/loopback/tcm_loop.c
Original file line number Diff line number Diff line change
Expand Up @@ -772,16 +772,6 @@ static u32 tcm_loop_get_inst_index(struct se_portal_group *se_tpg)
return 1;
}

static void tcm_loop_new_cmd_failure(struct se_cmd *se_cmd)
{
/*
* Since TCM_loop is already passing struct scatterlist data from
* struct scsi_cmnd, no more Linux/SCSI failure dependent state need
* to be handled here.
*/
return;
}

static int tcm_loop_is_state_remove(struct se_cmd *se_cmd)
{
/*
Expand Down Expand Up @@ -1446,7 +1436,6 @@ static int tcm_loop_register_configfs(void)
&tcm_loop_set_default_node_attributes;
fabric->tf_ops.get_task_tag = &tcm_loop_get_task_tag;
fabric->tf_ops.get_cmd_state = &tcm_loop_get_cmd_state;
fabric->tf_ops.new_cmd_failure = &tcm_loop_new_cmd_failure;
fabric->tf_ops.queue_data_in = &tcm_loop_queue_data_in;
fabric->tf_ops.queue_status = &tcm_loop_queue_status;
fabric->tf_ops.queue_tm_rsp = &tcm_loop_queue_tm_rsp;
Expand Down
4 changes: 0 additions & 4 deletions drivers/target/target_core_configfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -479,10 +479,6 @@ static int target_fabric_tf_ops_check(
printk(KERN_ERR "Missing tfo->get_cmd_state()\n");
return -EINVAL;
}
if (!(tfo->new_cmd_failure)) {
printk(KERN_ERR "Missing tfo->new_cmd_failure()\n");
return -EINVAL;
}
if (!(tfo->queue_data_in)) {
printk(KERN_ERR "Missing tfo->queue_data_in()\n");
return -EINVAL;
Expand Down
5 changes: 0 additions & 5 deletions drivers/target/target_core_tmr.c
Original file line number Diff line number Diff line change
Expand Up @@ -356,11 +356,6 @@ int core_tmr_lun_reset(
atomic_read(&cmd->t_fe_count));
/*
* Signal that the command has failed via cmd->se_cmd_flags,
* and call TFO->new_cmd_failure() to wakeup any fabric
* dependent code used to wait for unsolicited data out
* allocation to complete. The fabric module is expected
* to dump any remaining unsolicited data out for the aborted
* command at this point.
*/
transport_new_cmd_failure(cmd);

Expand Down
2 changes: 0 additions & 2 deletions drivers/target/target_core_transport.c
Original file line number Diff line number Diff line change
Expand Up @@ -2586,8 +2586,6 @@ void transport_new_cmd_failure(struct se_cmd *se_cmd)
se_cmd->se_cmd_flags |= SCF_SE_CMD_FAILED;
se_cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
spin_unlock_irqrestore(&se_cmd->t_state_lock, flags);

se_cmd->se_tfo->new_cmd_failure(se_cmd);
}

static void transport_nop_wait_for_tasks(struct se_cmd *, int, int);
Expand Down
1 change: 0 additions & 1 deletion drivers/target/tcm_fc/tcm_fc.h
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ int ft_write_pending(struct se_cmd *);
int ft_write_pending_status(struct se_cmd *);
u32 ft_get_task_tag(struct se_cmd *);
int ft_get_cmd_state(struct se_cmd *);
void ft_new_cmd_failure(struct se_cmd *);
int ft_queue_tm_resp(struct se_cmd *);
int ft_is_state_remove(struct se_cmd *);

Expand Down
6 changes: 0 additions & 6 deletions drivers/target/tcm_fc/tfc_cmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -292,12 +292,6 @@ int ft_is_state_remove(struct se_cmd *se_cmd)
return 0; /* XXX TBD */
}

void ft_new_cmd_failure(struct se_cmd *se_cmd)
{
/* XXX TBD */
printk(KERN_INFO "%s: se_cmd %p\n", __func__, se_cmd);
}

/*
* FC sequence response handler for follow-on sequences (data) and aborts.
*/
Expand Down
1 change: 0 additions & 1 deletion drivers/target/tcm_fc/tfc_conf.c
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,6 @@ static struct target_core_fabric_ops ft_fabric_ops = {
.set_default_node_attributes = ft_set_default_node_attr,
.get_task_tag = ft_get_task_tag,
.get_cmd_state = ft_get_cmd_state,
.new_cmd_failure = ft_new_cmd_failure,
.queue_data_in = ft_queue_data_in,
.queue_status = ft_queue_status,
.queue_tm_rsp = ft_queue_tm_resp,
Expand Down
1 change: 0 additions & 1 deletion include/target/target_core_fabric_ops.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ struct target_core_fabric_ops {
void (*set_default_node_attributes)(struct se_node_acl *);
u32 (*get_task_tag)(struct se_cmd *);
int (*get_cmd_state)(struct se_cmd *);
void (*new_cmd_failure)(struct se_cmd *);
int (*queue_data_in)(struct se_cmd *);
int (*queue_status)(struct se_cmd *);
int (*queue_tm_rsp)(struct se_cmd *);
Expand Down

0 comments on commit dc2e652

Please sign in to comment.