transport_generic_map_buffers_to_tasks has three difference cases that all
perform the same loop. Remove the function and inline that small loop into
the only caller.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Index: lio-core-2.6/drivers/target/target_core_transport.c
===================================================================
--- lio-core-2.6.orig/drivers/target/target_core_transport.c 2010-11-06 20:44:44.378004019 +0100
+++ lio-core-2.6/drivers/target/target_core_transport.c 2010-11-06 20:50:48.133255099 +0100
@@ -7092,75 +7092,6 @@ int transport_generic_map_mem_to_cmd(
EXPORT_SYMBOL(transport_generic_map_mem_to_cmd);
-/* transport_generic_map_buffers_to_tasks():
- *
- * Called from transport_generic_new_cmd() in Transport Processing Thread.
- */
-static int transport_generic_map_buffers_to_tasks(struct se_cmd *cmd)
-{
- struct se_task *task = NULL;
- int ret;
-
- /*
- * Deal with non [READ,WRITE]_XX CDBs here.
- */
- if (cmd->se_cmd_flags & SCF_SCSI_NON_DATA_CDB)
- goto non_scsi_data;
- else if (cmd->se_cmd_flags & SCF_SCSI_CONTROL_NONSG_IO_CDB) {
- list_for_each_entry(task, &T_TASK(cmd)->t_task_list, t_list) {
- if (atomic_read(&task->task_sent))
- continue;
-
- ret = task->transport_map_task(task, task->task_size);
- if (ret < 0)
- return ret;
-
- DEBUG_CMD_M("Mapping SCF_SCSI_CONTROL_NONSG_IO_CDB"
- " task_size: %u\n", task->task_size);
- }
- return 0;
- }
-
- /*
- * Determine the scatterlist offset for each struct se_task,
- * and segment and set pointers to storage transport buffers
- * via task->transport_map_task().
- */
- list_for_each_entry(task, &T_TASK(cmd)->t_task_list, t_list) {
- if (atomic_read(&task->task_sent))
- continue;
-
- ret = task->transport_map_task(task, task->task_size);
- if (ret < 0)
- return ret;
-
- DEBUG_CMD_M("Mapping task[%d]_se_obj_ptr[%p] %s_IO task_lba:"
- " %llu task_size: %u task_sg_num: %d\n",
- task->task_no, task->se_obj_ptr,
- (cmd->se_cmd_flags & SCF_SCSI_CONTROL_SG_IO_CDB) ?
- "CONTROL" : "DATA", task->task_lba, task->task_size,
- task->task_sg_num);
- }
-
- return 0;
-
-non_scsi_data:
- list_for_each_entry(task, &T_TASK(cmd)->t_task_list, t_list) {
- if (atomic_read(&task->task_sent))
- continue;
-
- ret = task->transport_map_task(task, task->task_size);
- if (ret < 0)
- return ret;
-
- DEBUG_CMD_M("Mapping SCF_SCSI_NON_DATA_CDB task_size: %u"
- " task->task_sg_num: %d\n", task->task_size,
- task->task_sg_num);
- }
-
- return 0;
-}
-
static inline long long transport_dev_end_lba(struct se_device *dev)
{
return dev->dev_sectors_total + 1;
@@ -7993,6 +7924,7 @@ int transport_generic_new_cmd(struct se_
{
struct se_portal_group *se_tpg;
struct se_transform_info ti;
+ struct se_task *task;
int ret = 0;
/*
* Generate struct se_task(s) and/or their payloads for this CDB.
@@ -8055,9 +7987,14 @@ int transport_generic_new_cmd(struct se_
* buffer list in struct se_cmd to the transport task's native
* buffers format.
*/
- ret = transport_generic_map_buffers_to_tasks(cmd);
- if (ret < 0)
- goto failure;
+ list_for_each_entry(task, &T_TASK(cmd)->t_task_list, t_list) {
+ if (atomic_read(&task->task_sent))
+ continue;
+
+ ret = task->transport_map_task(task, task->task_size);
+ if (ret < 0)
+ goto failure;
+ }
/*
* For WRITEs, let the iSCSI Target RX Thread know its buffer is ready..
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
