提交 3ea160b3 编写于 作者: R Roland Dreier 提交者: Nicholas Bellinger

target: Fix handling of aborted commands

- 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: NRoland Dreier <roland@purestorage.com>
Cc: stable@vger.kernel.org
Signed-off-by: NNicholas Bellinger <nab@risingtidesystems.com>
上级 3d70f8c6
...@@ -1819,8 +1819,10 @@ void target_execute_cmd(struct se_cmd *cmd) ...@@ -1819,8 +1819,10 @@ void target_execute_cmd(struct se_cmd *cmd)
/* /*
* If the received CDB has aleady been aborted stop processing it here. * 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; return;
}
/* /*
* Determine if IOCTL context caller in requesting the stopping of this * Determine if IOCTL context caller in requesting the stopping of this
...@@ -3067,7 +3069,7 @@ void transport_send_task_abort(struct se_cmd *cmd) ...@@ -3067,7 +3069,7 @@ void transport_send_task_abort(struct se_cmd *cmd)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&cmd->t_state_lock, 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); spin_unlock_irqrestore(&cmd->t_state_lock, flags);
return; return;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册