target: remove unused se_subsystem_api methods

The cdb_none, map_data_SG and map_control_SG methods have no callers left
and can be removed now.

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

diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index e5905269c8500082096ea82281c677cdf1a78005..ae1efc7c9ec6923fba484e86a66ffbf06911104f 100644 (file)
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -4023,7 +4023,7 @@ static int transport_allocate_data_tasks(
        struct se_task *task;
        struct se_device *dev = cmd->se_dev;
        unsigned long flags;
-       int task_count, i, ret;
+       int task_count, i;
        sector_t sectors, dev_max_sectors = dev->se_sub_dev->se_dev_attrib.max_sectors;
        u32 sector_size = dev->se_sub_dev->se_dev_attrib.block_size;
        struct scatterlist *sg;
@@ -4101,20 +4101,6 @@ static int transport_allocate_data_tasks(
                list_add_tail(&task->t_list, &cmd->t_task_list);
                spin_unlock_irqrestore(&cmd->t_state_lock, flags);
        }
-       /*
-        * Now perform the memory map of task->task_sg[] into backend
-        * subsystem memory..
-        */
-       list_for_each_entry(task, &cmd->t_task_list, t_list) {
-               if (atomic_read(&task->task_sent))
-                       continue;
-               if (!dev->transport->map_data_SG)
-                       continue;
-
-               ret = dev->transport->map_data_SG(task);
-               if (ret < 0)
-                       return 0;
-       }
 
        return task_count;
 }
@@ -4126,7 +4112,6 @@ transport_allocate_control_task(struct se_cmd *cmd)
        unsigned char *cdb;
        struct se_task *task;
        unsigned long flags;
-       int ret = 0;
 
        task = transport_generic_get_task(cmd, cmd->data_direction);
        if (!task)
@@ -4153,21 +4138,8 @@ transport_allocate_control_task(struct se_cmd *cmd)
        list_add_tail(&task->t_list, &cmd->t_task_list);
        spin_unlock_irqrestore(&cmd->t_state_lock, flags);
 
-       if (cmd->se_cmd_flags & SCF_SCSI_CONTROL_SG_IO_CDB) {
-               if (dev->transport->map_control_SG)
-                       ret = dev->transport->map_control_SG(task);
-       } else if (cmd->se_cmd_flags & SCF_SCSI_NON_DATA_CDB) {
-               if (dev->transport->cdb_none)
-                       ret = dev->transport->cdb_none(task);
-       } else {
-               pr_err("target: Unknown control cmd type!\n");
-               BUG();
-       }
-
        /* Success! Return number of tasks allocated */
-       if (ret == 0)
-               return 1;
-       return ret;
+       return 1;
 }
 
 static u32 transport_allocate_tasks(

diff --git a/include/target/target_core_transport.h b/include/target/target_core_transport.h
index e67feeb88b69f962a4ef07bb376394f8eb7692d4..549b6b332b1b1c0f3ce4313fb5d91ba44a1349bd 100644 (file)
--- a/include/target/target_core_transport.h
+++ b/include/target/target_core_transport.h
@@ -233,18 +233,6 @@ struct se_subsystem_api {
         * Used for global se_subsystem_api list_head
         */
        struct list_head sub_api_list;
-       /*
-        * For SCF_SCSI_NON_DATA_CDB
-        */
-       int (*cdb_none)(struct se_task *);
-       /*
-        * For SCF_SCSI_DATA_SG_IO_CDB
-        */
-       int (*map_data_SG)(struct se_task *);
-       /*
-        * For SCF_SCSI_CONTROL_SG_IO_CDB
-        */
-       int (*map_control_SG)(struct se_task *);
        /*
         * attach_hba():
         */