diff options
author | Andy Grover <agrover@redhat.com> | 2011-05-02 20:12:10 -0400 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-07-22 05:37:44 -0400 |
commit | a1d8b49abd60ba5d09e7c968731abcb0f8f1cbf6 (patch) | |
tree | 8cbfd54b4829fd5f0ed206e15c81c1e626e7701d /drivers/target/loopback/tcm_loop.c | |
parent | dd3a5ad8e0c8706659f02c4a72b8c87f6f7ab479 (diff) |
target: Updates from AGrover and HCH (round 3)
This patch contains a squashed version of third round series cleanups,
improvements ,and simplfications from Andy and Christoph ahead of the
heavy lifting between round 3 -> 4 for the target core SGL conversion.
This include cleanups to the main target I/O path and other miscellaneous
updates.
target: Replace custom sg<->buf functions with lib funcs
target: Simplify sector limiting code
target: get_cdb should never return NULL
target: Simplify transport_memcpy_se_mem_read_contig
target: Use assignment rather than increment for t_task_cdbs
target: Don't pass dma_size to generic_get_mem
target: Pass sg with type scatterlist in transport_map_sg_to_mem
target: Move task_sg_num next to task_sg in struct se_task
target: inline struct se_transport_task into struct se_cmd
target: Change name & semantics of transport_get_sectors()
target: Remove unused members of se_cmd
target: Rename se_cmd.t_task_cdbs to t_task_list_num
target: Fix some spelling
target: Remove unused var from transport_generic_do_tmr
target: map_sg_to_mem: return sg_count in return value
target/pscsi: Use min_t for sector limits
target/pscsi: Unused param for pscsi_get_bio()
target: Rename get_cdb_count to allocate_tasks
target: Make transport_generic_new_cmd() available for iscsi-target
target: Remove fabric callback to allocate iovecs
target: Fix transport_generic_new_cmd WRITE comment
(hch: Use __GFP_ZERO usage for alloc_pages() usage)
Signed-off-by: Andy Grover <agrover@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target/loopback/tcm_loop.c')
-rw-r--r-- | drivers/target/loopback/tcm_loop.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c index eeb7ee7ab9f7..7ba2542aabe7 100644 --- a/drivers/target/loopback/tcm_loop.c +++ b/drivers/target/loopback/tcm_loop.c | |||
@@ -118,7 +118,7 @@ static struct se_cmd *tcm_loop_allocate_core_cmd( | |||
118 | * Signal BIDI usage with T_TASK(cmd)->t_tasks_bidi | 118 | * Signal BIDI usage with T_TASK(cmd)->t_tasks_bidi |
119 | */ | 119 | */ |
120 | if (scsi_bidi_cmnd(sc)) | 120 | if (scsi_bidi_cmnd(sc)) |
121 | se_cmd->t_task.t_tasks_bidi = 1; | 121 | se_cmd->t_tasks_bidi = 1; |
122 | /* | 122 | /* |
123 | * Locate the struct se_lun pointer and attach it to struct se_cmd | 123 | * Locate the struct se_lun pointer and attach it to struct se_cmd |
124 | */ | 124 | */ |
@@ -169,7 +169,7 @@ static int tcm_loop_new_cmd_map(struct se_cmd *se_cmd) | |||
169 | * For BIDI commands, pass in the extra READ buffer | 169 | * For BIDI commands, pass in the extra READ buffer |
170 | * to transport_generic_map_mem_to_cmd() below.. | 170 | * to transport_generic_map_mem_to_cmd() below.. |
171 | */ | 171 | */ |
172 | if (se_cmd->t_task.t_tasks_bidi) { | 172 | if (se_cmd->t_tasks_bidi) { |
173 | struct scsi_data_buffer *sdb = scsi_in(sc); | 173 | struct scsi_data_buffer *sdb = scsi_in(sc); |
174 | 174 | ||
175 | sgl_bidi = sdb->table.sgl; | 175 | sgl_bidi = sdb->table.sgl; |
@@ -1424,13 +1424,6 @@ static int tcm_loop_register_configfs(void) | |||
1424 | &tcm_loop_tpg_release_fabric_acl; | 1424 | &tcm_loop_tpg_release_fabric_acl; |
1425 | fabric->tf_ops.tpg_get_inst_index = &tcm_loop_get_inst_index; | 1425 | fabric->tf_ops.tpg_get_inst_index = &tcm_loop_get_inst_index; |
1426 | /* | 1426 | /* |
1427 | * Since tcm_loop is mapping physical memory from Linux/SCSI | ||
1428 | * struct scatterlist arrays for each struct scsi_cmnd I/O, | ||
1429 | * we do not need TCM to allocate a iovec array for | ||
1430 | * virtual memory address mappings | ||
1431 | */ | ||
1432 | fabric->tf_ops.alloc_cmd_iovecs = NULL; | ||
1433 | /* | ||
1434 | * Used for setting up remaining TCM resources in process context | 1427 | * Used for setting up remaining TCM resources in process context |
1435 | */ | 1428 | */ |
1436 | fabric->tf_ops.new_cmd_map = &tcm_loop_new_cmd_map; | 1429 | fabric->tf_ops.new_cmd_map = &tcm_loop_new_cmd_map; |