| From 3ea160b3e8f0de8161861995d9901f61192fc0b0 Mon Sep 17 00:00:00 2001 |
| From: Roland Dreier <roland@purestorage.com> |
| Date: Fri, 16 Nov 2012 08:06:16 -0800 |
| Subject: target: Fix handling of aborted commands |
| |
| From: Roland Dreier <roland@purestorage.com> |
| |
| commit 3ea160b3e8f0de8161861995d9901f61192fc0b0 upstream. |
| |
| - If we stop processing an already-aborted command in |
| target_execute_cmd(), then we need to complete t_transport_stop_comp |
| to wake up the the TMR handling thread, or else it will end up |
| waiting forever. |
| |
| - If we've a already sent an "aborted" status for a command in |
| transport_check_aborted_status() then we should bail out of |
| transport_send_task_abort() to avoid freeing the command twice. |
| |
| Signed-off-by: Roland Dreier <roland@purestorage.com> |
| Signed-off-by: Nicholas Bellinger <nab@risingtidesystems.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/target/target_core_transport.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/target/target_core_transport.c |
| +++ b/drivers/target/target_core_transport.c |
| @@ -1756,8 +1756,10 @@ void target_execute_cmd(struct se_cmd *c |
| /* |
| * If the received CDB has aleady been aborted stop processing it here. |
| */ |
| - if (transport_check_aborted_status(cmd, 1)) |
| + if (transport_check_aborted_status(cmd, 1)) { |
| + complete(&cmd->t_transport_stop_comp); |
| return; |
| + } |
| |
| /* |
| * Determine if IOCTL context caller in requesting the stopping of this |
| @@ -3029,7 +3031,7 @@ void transport_send_task_abort(struct se |
| unsigned long flags; |
| |
| spin_lock_irqsave(&cmd->t_state_lock, flags); |
| - if (cmd->se_cmd_flags & SCF_SENT_CHECK_CONDITION) { |
| + if (cmd->se_cmd_flags & (SCF_SENT_CHECK_CONDITION | SCF_SENT_DELAYED_TAS)) { |
| spin_unlock_irqrestore(&cmd->t_state_lock, flags); |
| return; |
| } |
