Signed-off-by: Christoph Hellwig <hch@xxxxxx>
---
drivers/target/target_core_transport.c | 39 ---------------------------------
include/target/target_core_base.h | 1
include/target/target_core_fabric.h | 1
3 files changed, 41 deletions(-)
Index: lio-core/drivers/target/target_core_transport.c
===================================================================
--- lio-core.orig/drivers/target/target_core_transport.c 2012-06-29 10:40:13.337694753 +0200
+++ lio-core/drivers/target/target_core_transport.c 2012-06-29 10:41:45.114360872 +0200
@@ -1577,12 +1577,6 @@ void target_submit_cmd(struct se_cmd *se
*/
core_alua_check_nonop_delay(se_cmd);
- /*
- * Dispatch se_cmd descriptor to se_lun->lun_se_dev backend
- * for immediate execution of READs, otherwise wait for
- * transport_generic_handle_data() to be called for WRITEs
- * when fabric has filled the incoming buffer.
- */
transport_handle_cdb_direct(se_cmd);
return;
}
@@ -1675,36 +1669,6 @@ int transport_generic_handle_cdb_map(
}
EXPORT_SYMBOL(transport_generic_handle_cdb_map);
-/* transport_generic_handle_data():
- *
- *
- */
-int transport_generic_handle_data(
- struct se_cmd *cmd)
-{
- /*
- * For the software fabric case, then we assume the nexus is being
- * failed/shutdown when signals are pending from the kthread context
- * caller, so we return a failure. For the HW target mode case running
- * in interrupt code, the signal_pending() check is skipped.
- */
- if (!in_interrupt() && signal_pending(current))
- return -EPERM;
- /*
- * If the received CDB has aleady been ABORTED by the generic
- * target engine, we now call transport_check_aborted_status()
- * to queue any delated TASK_ABORTED status for the received CDB to the
- * fabric module as we are expecting no further incoming DATA OUT
- * sequences at this point.
- */
- if (transport_check_aborted_status(cmd, 1) != 0)
- return 0;
-
- transport_add_cmd_to_queue(cmd, TRANSPORT_PROCESS_WRITE, false);
- return 0;
-}
-EXPORT_SYMBOL(transport_generic_handle_data);
-
/* transport_generic_handle_tmr():
*
*
@@ -3289,9 +3253,6 @@ get_cmd:
break;
}
break;
- case TRANSPORT_PROCESS_WRITE:
- target_execute_cmd(cmd);
- break;
case TRANSPORT_PROCESS_TMR:
transport_generic_do_tmr(cmd);
break;
Index: lio-core/include/target/target_core_fabric.h
===================================================================
--- lio-core.orig/include/target/target_core_fabric.h 2012-06-29 10:15:53.604370140 +0200
+++ lio-core/include/target/target_core_fabric.h 2012-06-29 10:40:26.057694674 +0200
@@ -115,7 +115,6 @@ int target_submit_tmr(struct se_cmd *se_
gfp_t, unsigned int, int);
int transport_handle_cdb_direct(struct se_cmd *);
int transport_generic_handle_cdb_map(struct se_cmd *);
-int transport_generic_handle_data(struct se_cmd *);
int transport_generic_map_mem_to_cmd(struct se_cmd *cmd,
struct scatterlist *, u32, struct scatterlist *, u32);
int transport_generic_new_cmd(struct se_cmd *);
Index: lio-core/include/target/target_core_base.h
===================================================================
--- lio-core.orig/include/target/target_core_base.h 2012-06-25 15:45:23.914041238 +0200
+++ lio-core/include/target/target_core_base.h 2012-06-29 10:41:27.001027692 +0200
@@ -145,7 +145,6 @@ enum transport_state_table {
TRANSPORT_NO_STATE = 0,
TRANSPORT_NEW_CMD = 1,
TRANSPORT_WRITE_PENDING = 3,
- TRANSPORT_PROCESS_WRITE = 4,
TRANSPORT_PROCESSING = 5,
TRANSPORT_COMPLETE = 6,
TRANSPORT_PROCESS_TMR = 9,
--
To unsubscribe from this list: send the line "unsubscribe target-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
