diff options
| author | Nicholas Bellinger <nab@linux-iscsi.org> | 2014-06-09 23:13:20 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-30 20:09:44 -0700 |
| commit | 7f2a9059e6f1ad09e59b098f9096068c4b2288c0 (patch) | |
| tree | cd8e9fbc90250c56eb9917c695e3a23848557599 /drivers/target | |
| parent | 1813e80ef7833579ba7a802781a66361a3d8906d (diff) | |
| download | linux-3.10-7f2a9059e6f1ad09e59b098f9096068c4b2288c0.tar.gz linux-3.10-7f2a9059e6f1ad09e59b098f9096068c4b2288c0.tar.bz2 linux-3.10-7f2a9059e6f1ad09e59b098f9096068c4b2288c0.zip | |
target: Set CMD_T_ACTIVE bit for Task Management Requests
commit f15e9cd910c4d9da7de43f2181f362082fc45f0f upstream.
This patch fixes a bug where se_cmd descriptors associated with a
Task Management Request (TMR) where not setting CMD_T_ACTIVE before
being dispatched into target_tmr_work() process context.
This is required in order for transport_generic_free_cmd() ->
transport_wait_for_tasks() to wait on se_cmd->t_transport_stop_comp
if a session reset event occurs while an ABORT_TASK is outstanding
waiting for another I/O to complete.
Cc: Thomas Glanzmann <thomas@glanzmann.de>
Cc: Charalampos Pournaris <charpour@gmail.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/target')
| -rw-r--r-- | drivers/target/target_core_transport.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index 21e315874a5..7dddabe8317 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c @@ -2877,6 +2877,12 @@ static void target_tmr_work(struct work_struct *work) int transport_generic_handle_tmr( struct se_cmd *cmd) { + unsigned long flags; + + spin_lock_irqsave(&cmd->t_state_lock, flags); + cmd->transport_state |= CMD_T_ACTIVE; + spin_unlock_irqrestore(&cmd->t_state_lock, flags); + INIT_WORK(&cmd->work, target_tmr_work); queue_work(cmd->se_dev->tmr_wq, &cmd->work); return 0; |