diff options
author | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-10-23 21:46:36 -0400 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-10-23 23:22:08 -0400 |
commit | 2e982ab92dff057c639d4a43ccfa275be62f5e59 (patch) | |
tree | 8c8467e06736efa042006b11210281894c75bd95 /include/target/target_core_base.h | |
parent | 415a090ade7e674018e3fa4255938e4c312339b3 (diff) |
target: Remove legacy se_task->task_timer and associated logic
This patch removes the legacy usage of se_task->task_timer and associated
infrastructure that originally was used as a way to help manage buggy backend
SCSI LLDs that in certain cases would never return back an outstanding task.
This includes the removal of target_complete_timeout_work(), timeout logic
from transport_complete_task(), transport_task_timeout_handler(),
transport_start_task_timer(), the per device task_timeout configfs attribute,
and all task_timeout associated structure members and defines in
target_core_base.h
This is being removed in preparation to make transport_complete_task() run
in lock-less mode.
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'include/target/target_core_base.h')
-rw-r--r-- | include/target/target_core_base.h | 7 |
1 files changed, 1 insertions, 6 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 { | |||
75 | enum se_task_flags { | 75 | enum se_task_flags { |
76 | TF_ACTIVE = (1 << 0), | 76 | TF_ACTIVE = (1 << 0), |
77 | TF_SENT = (1 << 1), | 77 | TF_SENT = (1 << 1), |
78 | TF_TIMEOUT = (1 << 2), | 78 | TF_REQUEST_STOP = (1 << 2), |
79 | TF_REQUEST_STOP = (1 << 3), | ||
80 | }; | 79 | }; |
81 | 80 | ||
82 | /* Special transport agnostic struct se_cmd->t_states */ | 81 | /* Special transport agnostic struct se_cmd->t_states */ |
@@ -404,7 +403,6 @@ struct se_task { | |||
404 | int task_error_status; | 403 | int task_error_status; |
405 | enum dma_data_direction task_data_direction; | 404 | enum dma_data_direction task_data_direction; |
406 | atomic_t task_state_active; | 405 | atomic_t task_state_active; |
407 | struct timer_list task_timer; | ||
408 | struct list_head t_list; | 406 | struct list_head t_list; |
409 | struct list_head t_execute_list; | 407 | struct list_head t_execute_list; |
410 | struct list_head t_state_list; | 408 | struct list_head t_state_list; |
@@ -469,7 +467,6 @@ struct se_cmd { | |||
469 | atomic_t t_se_count; | 467 | atomic_t t_se_count; |
470 | atomic_t t_task_cdbs_left; | 468 | atomic_t t_task_cdbs_left; |
471 | atomic_t t_task_cdbs_ex_left; | 469 | atomic_t t_task_cdbs_ex_left; |
472 | atomic_t t_task_cdbs_timeout_left; | ||
473 | atomic_t t_task_cdbs_sent; | 470 | atomic_t t_task_cdbs_sent; |
474 | atomic_t t_transport_aborted; | 471 | atomic_t t_transport_aborted; |
475 | atomic_t t_transport_active; | 472 | atomic_t t_transport_active; |
@@ -477,7 +474,6 @@ struct se_cmd { | |||
477 | atomic_t t_transport_queue_active; | 474 | atomic_t t_transport_queue_active; |
478 | atomic_t t_transport_sent; | 475 | atomic_t t_transport_sent; |
479 | atomic_t t_transport_stop; | 476 | atomic_t t_transport_stop; |
480 | atomic_t t_transport_timeout; | ||
481 | atomic_t transport_dev_active; | 477 | atomic_t transport_dev_active; |
482 | atomic_t transport_lun_active; | 478 | atomic_t transport_lun_active; |
483 | atomic_t transport_lun_fe_stop; | 479 | atomic_t transport_lun_fe_stop; |
@@ -646,7 +642,6 @@ struct se_dev_attrib { | |||
646 | u32 optimal_sectors; | 642 | u32 optimal_sectors; |
647 | u32 hw_queue_depth; | 643 | u32 hw_queue_depth; |
648 | u32 queue_depth; | 644 | u32 queue_depth; |
649 | u32 task_timeout; | ||
650 | u32 max_unmap_lba_count; | 645 | u32 max_unmap_lba_count; |
651 | u32 max_unmap_block_desc_count; | 646 | u32 max_unmap_block_desc_count; |
652 | u32 unmap_granularity; | 647 | u32 unmap_granularity; |