target: remove the always-noop ->new_cmd_failure method

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index 7ba2542aabe7cd1f8967fff942081e98c86fb21c..cb4a9b906a4b069cc79bcd7401a30594d5048c7f 100644 (file)
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -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)
 {
        /*
@@ -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;

diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index ac7f7655570e2a2828fa3225a20e23752dd72b53..aac0ee993b90a21387f2ed2658e2839d6ff4b839 100644 (file)
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -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;

diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
index 6667e39a35a13944cd078fce30683330f128d00b..5c20de3f1d1cf04c18572b69d972ca3f47c0bbc6 100644 (file)
--- a/drivers/target/target_core_tmr.c
+++ b/drivers/target/target_core_tmr.c
@@ -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);
 

diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 6f2855dac7f8a7bf4075e4cdf48237551c362174..e3544c86d1fa676a31ae0ea02caf8c1ba37c6089 100644 (file)
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -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);

diff --git a/drivers/target/tcm_fc/tcm_fc.h b/drivers/target/tcm_fc/tcm_fc.h
index 7b82f1b7fef814b595f8cc266f182baa3f031642..8d26779e440c3ca909eefcfbc9782e1a22742d9e 100644 (file)
--- a/drivers/target/tcm_fc/tcm_fc.h
+++ b/drivers/target/tcm_fc/tcm_fc.h
@@ -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 *);
 

diff --git a/drivers/target/tcm_fc/tfc_cmd.c b/drivers/target/tcm_fc/tfc_cmd.c
index 910306ce48de72ceacc2c4cff437a8fc885da2bc..9a3b486e1aad032bef37d4c495820e415d99fff3 100644 (file)
--- a/drivers/target/tcm_fc/tfc_cmd.c
+++ b/drivers/target/tcm_fc/tfc_cmd.c
@@ -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.
  */

diff --git a/drivers/target/tcm_fc/tfc_conf.c b/drivers/target/tcm_fc/tfc_conf.c
index 58e4745749db2e8b5e3df0358491b12556af4fc4..20097728e8a09215caddd39d7cf8d37a49f812e1 100644 (file)
--- a/drivers/target/tcm_fc/tfc_conf.c
+++ b/drivers/target/tcm_fc/tfc_conf.c
@@ -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,

diff --git a/include/target/target_core_fabric_ops.h b/include/target/target_core_fabric_ops.h
index 1752ed3f77fad90aedd839df9093f77884997961..eba7201e560973cb214f776ad4e6d8c8638e87ca 100644 (file)
--- a/include/target/target_core_fabric_ops.h
+++ b/include/target/target_core_fabric_ops.h
@@ -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 *);