target: Prevent transport_send_task_abort when CHECK_CONDITION status
authorNicholas Bellinger <nab@linux-iscsi.org>
Thu, 29 Sep 2011 21:22:13 +0000 (14:22 -0700)
committerNicholas Bellinger <nab@linux-iscsi.org>
Mon, 24 Oct 2011 03:20:12 +0000 (03:20 +0000)
This patch fixes a bug where transport_send_task_abort() could be called
during LUN_RESET to return SAM_STAT_TASK_ABORTED + tfo->queue_status(), when
SCF_SENT_CHECK_CONDITION -> tfo->queue_status() has already been sent from
within another context via transport_send_check_condition_and_sense().

Cc: stable@kernel.org
Signed-off-by: Nicholas Bellinger <nab@risingtidesystems.com>
drivers/target/target_core_transport.c

index 009547b3557468a521f5614e3dea6f7dfe130239..af1e0a5f9bc6cf9a1b7619a88e61fe0d66f42d36 100644 (file)
@@ -4919,6 +4919,15 @@ EXPORT_SYMBOL(transport_check_aborted_status);
 
 void transport_send_task_abort(struct se_cmd *cmd)
 {
+       unsigned long flags;
+
+       spin_lock_irqsave(&cmd->t_state_lock, flags);
+       if (cmd->se_cmd_flags & SCF_SENT_CHECK_CONDITION) {
+               spin_unlock_irqrestore(&cmd->t_state_lock, flags);
+               return;
+       }
+       spin_unlock_irqrestore(&cmd->t_state_lock, flags);
+
        /*
         * If there are still expected incoming fabric WRITEs, we wait
         * until until they have completed before sending a TASK_ABORTED