2 files changed, 4 insertions, 19 deletions

diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index d210f1fe9962..35aa786f93da 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -75,8 +75,7 @@ enum transport_tpg_type_table {
 enum se_task_flags {
         TF_ACTIVE               = (1 << 0),
         TF_SENT                 = (1 << 1),
-        TF_TIMEOUT              = (1 << 2),
-        TF_REQUEST_STOP         = (1 << 3),
+        TF_REQUEST_STOP         = (1 << 2),
 };
 
 /* Special transport agnostic struct se_cmd->t_states */
@@ -404,7 +403,6 @@ struct se_task {
         int                     task_error_status;
         enum dma_data_direction task_data_direction;
         atomic_t                task_state_active;
-        struct timer_list       task_timer;
         struct list_head        t_list;
         struct list_head        t_execute_list;
         struct list_head        t_state_list;
@@ -469,7 +467,6 @@ struct se_cmd {
         atomic_t                t_se_count;
         atomic_t                t_task_cdbs_left;
         atomic_t                t_task_cdbs_ex_left;
-        atomic_t                t_task_cdbs_timeout_left;
         atomic_t                t_task_cdbs_sent;
         atomic_t                t_transport_aborted;
         atomic_t                t_transport_active;
@@ -477,7 +474,6 @@ struct se_cmd {
         atomic_t                t_transport_queue_active;
         atomic_t                t_transport_sent;
         atomic_t                t_transport_stop;
-        atomic_t                t_transport_timeout;
         atomic_t                transport_dev_active;
         atomic_t                transport_lun_active;
         atomic_t                transport_lun_fe_stop;
@@ -646,7 +642,6 @@ struct se_dev_attrib {
         u32             optimal_sectors;
         u32             hw_queue_depth;
         u32             queue_depth;
-        u32             task_timeout;
         u32             max_unmap_lba_count;
         u32             max_unmap_block_desc_count;
         u32             unmap_granularity;
diff --git a/include/target/target_core_transport.h b/include/target/target_core_transport.h
index 32c586346c0e..a037a1a6fbba 100644
--- a/include/target/target_core_transport.h
+++ b/include/target/target_core_transport.h
@@ -22,10 +22,9 @@
 #define PYX_TRANSPORT_LU_COMM_FAILURE           -7
 #define PYX_TRANSPORT_UNKNOWN_MODE_PAGE         -8
 #define PYX_TRANSPORT_WRITE_PROTECTED           -9
-#define PYX_TRANSPORT_TASK_TIMEOUT              -10
-#define PYX_TRANSPORT_RESERVATION_CONFLICT      -11
-#define PYX_TRANSPORT_ILLEGAL_REQUEST           -12
-#define PYX_TRANSPORT_USE_SENSE_REASON          -13
+#define PYX_TRANSPORT_RESERVATION_CONFLICT      -10
+#define PYX_TRANSPORT_ILLEGAL_REQUEST           -11
+#define PYX_TRANSPORT_USE_SENSE_REASON          -12
 
 #ifndef SAM_STAT_RESERVATION_CONFLICT
 #define SAM_STAT_RESERVATION_CONFLICT           0x18
@@ -38,13 +37,6 @@
 #define TRANSPORT_PLUGIN_VHBA_PDEV              2
 #define TRANSPORT_PLUGIN_VHBA_VDEV              3
 
-/* For SE OBJ Plugins, in seconds */
-#define TRANSPORT_TIMEOUT_TUR                   10
-#define TRANSPORT_TIMEOUT_TYPE_DISK             60
-#define TRANSPORT_TIMEOUT_TYPE_ROM              120
-#define TRANSPORT_TIMEOUT_TYPE_TAPE             600
-#define TRANSPORT_TIMEOUT_TYPE_OTHER            300
-
 /*
  * struct se_subsystem_dev->su_dev_flags
 */
@@ -61,8 +53,6 @@
 #define DF_SPC2_RESERVATIONS_WITH_ISID          0x00000004
 
 /* struct se_dev_attrib sanity values */
-/* 10 Minutes */
-#define DA_TASK_TIMEOUT_MAX                     600
 /* Default max_unmap_lba_count */
 #define DA_MAX_UNMAP_LBA_COUNT                  0
 /* Default max_unmap_block_desc_count */