target: remove TF_TIMER_STOP
TF_TIMER_STOP is useless as it only helps to mitigate a tiny race during
deleting the timer. But given that we have cleared TF_ACTIVE at this point
we already have another mitigation a few lines down the function.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 6dab819..a36f445 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -2066,10 +2066,6 @@
pr_debug("transport task timeout fired! task: %p cmd: %p\n", task, cmd);
spin_lock_irqsave(&cmd->t_state_lock, flags);
- if (task->task_flags & TF_TIMER_STOP) {
- spin_unlock_irqrestore(&cmd->t_state_lock, flags);
- return;
- }
task->task_flags &= ~TF_TIMER_RUNNING;
/*
@@ -2153,14 +2149,12 @@
if (!(task->task_flags & TF_TIMER_RUNNING))
return;
- task->task_flags |= TF_TIMER_STOP;
spin_unlock_irqrestore(&cmd->t_state_lock, *flags);
del_timer_sync(&task->task_timer);
spin_lock_irqsave(&cmd->t_state_lock, *flags);
task->task_flags &= ~TF_TIMER_RUNNING;
- task->task_flags &= ~TF_TIMER_STOP;
}
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 77b3de8..8f02a65 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -78,7 +78,6 @@
TF_TIMEOUT = (1 << 2),
TF_REQUEST_STOP = (1 << 3),
TF_TIMER_RUNNING = (1 << 4),
- TF_TIMER_STOP = (1 << 5),
};
/* Special transport agnostic struct se_cmd->t_states */
