diff options
author | Christoph Hellwig <hch@lst.de> | 2011-09-12 15:51:14 -0400 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-10-23 23:20:28 -0400 |
commit | 680b73c5f2fb60336707b53b2b2792d2c01b69dc (patch) | |
tree | 2c80c260bda7e87dadb11dd3b91b70828fc775fb | |
parent | acf3ecc4a1c7460662757c07ee1ec625760d3ae6 (diff) |
target: remove transport_generic_handle_cdb
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
-rw-r--r-- | drivers/target/target_core_transport.c | 23 | ||||
-rw-r--r-- | include/target/target_core_transport.h | 1 |
2 files changed, 3 insertions, 21 deletions
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index af1e0a5f9bc6..f0f21bb28400 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c | |||
@@ -1728,24 +1728,6 @@ int transport_generic_allocate_tasks( | |||
1728 | } | 1728 | } |
1729 | EXPORT_SYMBOL(transport_generic_allocate_tasks); | 1729 | EXPORT_SYMBOL(transport_generic_allocate_tasks); |
1730 | 1730 | ||
1731 | /* | ||
1732 | * Used by fabric module frontends not defining a TFO->new_cmd_map() | ||
1733 | * to queue up a newly setup se_cmd w/ TRANSPORT_NEW_CMD statis | ||
1734 | */ | ||
1735 | int transport_generic_handle_cdb( | ||
1736 | struct se_cmd *cmd) | ||
1737 | { | ||
1738 | if (!cmd->se_lun) { | ||
1739 | dump_stack(); | ||
1740 | pr_err("cmd->se_lun is NULL\n"); | ||
1741 | return -EINVAL; | ||
1742 | } | ||
1743 | |||
1744 | transport_add_cmd_to_queue(cmd, TRANSPORT_NEW_CMD); | ||
1745 | return 0; | ||
1746 | } | ||
1747 | EXPORT_SYMBOL(transport_generic_handle_cdb); | ||
1748 | |||
1749 | static void transport_generic_request_failure(struct se_cmd *, | 1731 | static void transport_generic_request_failure(struct se_cmd *, |
1750 | struct se_device *, int, int); | 1732 | struct se_device *, int, int); |
1751 | /* | 1733 | /* |
@@ -5205,6 +5187,9 @@ get_cmd: | |||
5205 | continue; | 5187 | continue; |
5206 | 5188 | ||
5207 | switch (cmd->t_state) { | 5189 | switch (cmd->t_state) { |
5190 | case TRANSPORT_NEW_CMD: | ||
5191 | BUG(); | ||
5192 | break; | ||
5208 | case TRANSPORT_NEW_CMD_MAP: | 5193 | case TRANSPORT_NEW_CMD_MAP: |
5209 | if (!cmd->se_tfo->new_cmd_map) { | 5194 | if (!cmd->se_tfo->new_cmd_map) { |
5210 | pr_err("cmd->se_tfo->new_cmd_map is" | 5195 | pr_err("cmd->se_tfo->new_cmd_map is" |
@@ -5219,8 +5204,6 @@ get_cmd: | |||
5219 | DMA_TO_DEVICE)); | 5204 | DMA_TO_DEVICE)); |
5220 | break; | 5205 | break; |
5221 | } | 5206 | } |
5222 | /* Fall through */ | ||
5223 | case TRANSPORT_NEW_CMD: | ||
5224 | ret = transport_generic_new_cmd(cmd); | 5207 | ret = transport_generic_new_cmd(cmd); |
5225 | if (ret == -EAGAIN) | 5208 | if (ret == -EAGAIN) |
5226 | break; | 5209 | break; |
diff --git a/include/target/target_core_transport.h b/include/target/target_core_transport.h index 46aae4f94ede..0482a28629ff 100644 --- a/include/target/target_core_transport.h +++ b/include/target/target_core_transport.h | |||
@@ -171,7 +171,6 @@ void *transport_kmap_first_data_page(struct se_cmd *cmd); | |||
171 | void transport_kunmap_first_data_page(struct se_cmd *cmd); | 171 | void transport_kunmap_first_data_page(struct se_cmd *cmd); |
172 | extern void transport_free_se_cmd(struct se_cmd *); | 172 | extern void transport_free_se_cmd(struct se_cmd *); |
173 | extern int transport_generic_allocate_tasks(struct se_cmd *, unsigned char *); | 173 | extern int transport_generic_allocate_tasks(struct se_cmd *, unsigned char *); |
174 | extern int transport_generic_handle_cdb(struct se_cmd *); | ||
175 | extern int transport_handle_cdb_direct(struct se_cmd *); | 174 | extern int transport_handle_cdb_direct(struct se_cmd *); |
176 | extern int transport_generic_handle_cdb_map(struct se_cmd *); | 175 | extern int transport_generic_handle_cdb_map(struct se_cmd *); |
177 | extern int transport_generic_handle_data(struct se_cmd *); | 176 | extern int transport_generic_handle_data(struct se_cmd *); |