diff options
-rw-r--r-- | drivers/target/target_core_transport.c | 6 | ||||
-rw-r--r-- | include/target/target_core_base.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index 6dab8198ace8..a36f4451e5db 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c | |||
@@ -2066,10 +2066,6 @@ static void transport_task_timeout_handler(unsigned long data) | |||
2066 | pr_debug("transport task timeout fired! task: %p cmd: %p\n", task, cmd); | 2066 | pr_debug("transport task timeout fired! task: %p cmd: %p\n", task, cmd); |
2067 | 2067 | ||
2068 | spin_lock_irqsave(&cmd->t_state_lock, flags); | 2068 | spin_lock_irqsave(&cmd->t_state_lock, flags); |
2069 | if (task->task_flags & TF_TIMER_STOP) { | ||
2070 | spin_unlock_irqrestore(&cmd->t_state_lock, flags); | ||
2071 | return; | ||
2072 | } | ||
2073 | task->task_flags &= ~TF_TIMER_RUNNING; | 2069 | task->task_flags &= ~TF_TIMER_RUNNING; |
2074 | 2070 | ||
2075 | /* | 2071 | /* |
@@ -2153,14 +2149,12 @@ void __transport_stop_task_timer(struct se_task *task, unsigned long *flags) | |||
2153 | if (!(task->task_flags & TF_TIMER_RUNNING)) | 2149 | if (!(task->task_flags & TF_TIMER_RUNNING)) |
2154 | return; | 2150 | return; |
2155 | 2151 | ||
2156 | task->task_flags |= TF_TIMER_STOP; | ||
2157 | spin_unlock_irqrestore(&cmd->t_state_lock, *flags); | 2152 | spin_unlock_irqrestore(&cmd->t_state_lock, *flags); |
2158 | 2153 | ||
2159 | del_timer_sync(&task->task_timer); | 2154 | del_timer_sync(&task->task_timer); |
2160 | 2155 | ||
2161 | spin_lock_irqsave(&cmd->t_state_lock, *flags); | 2156 | spin_lock_irqsave(&cmd->t_state_lock, *flags); |
2162 | task->task_flags &= ~TF_TIMER_RUNNING; | 2157 | task->task_flags &= ~TF_TIMER_RUNNING; |
2163 | task->task_flags &= ~TF_TIMER_STOP; | ||
2164 | } | 2158 | } |
2165 | 2159 | ||
2166 | static void transport_stop_all_task_timers(struct se_cmd *cmd) | 2160 | static void transport_stop_all_task_timers(struct se_cmd *cmd) |
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h index 77b3de846340..8f02a65de75f 100644 --- a/include/target/target_core_base.h +++ b/include/target/target_core_base.h | |||
@@ -78,7 +78,6 @@ enum se_task_flags { | |||
78 | TF_TIMEOUT = (1 << 2), | 78 | TF_TIMEOUT = (1 << 2), |
79 | TF_REQUEST_STOP = (1 << 3), | 79 | TF_REQUEST_STOP = (1 << 3), |
80 | TF_TIMER_RUNNING = (1 << 4), | 80 | TF_TIMER_RUNNING = (1 << 4), |
81 | TF_TIMER_STOP = (1 << 5), | ||
82 | }; | 81 | }; |
83 | 82 | ||
84 | /* Special transport agnostic struct se_cmd->t_states */ | 83 | /* Special transport agnostic struct se_cmd->t_states */ |