[SCSI] isci: Fix task management for SMP, SATA and on dev remove.

libsas uses the LLDD abort task interface to handle I/O timeouts
in the SATA/STP and SMP discovery paths, so this change will terminate
STP/SMP requests. Also, if the device is gone, the lldd will prevent
libsas from further escalations in the error handler.

Signed-off-by: Jeff Skirvin <jeffrey.d.skirvin@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 3 insertions, 30 deletions

diff --git a/drivers/scsi/isci/task.h b/drivers/scsi/isci/task.h
index c9ccd0b5ff53..bc78c0a41d5c 100644
--- a/drivers/scsi/isci/task.h
+++ b/drivers/scsi/isci/task.h
@@ -226,35 +226,6 @@ enum isci_completion_selection {
         isci_perform_error_io_completion        /* Use sas_task_abort */
 };
 
-static inline void isci_set_task_doneflags(
-        struct sas_task *task)
-{
-        /* Since no futher action will be taken on this task,
-         * make sure to mark it complete from the lldd perspective.
-         */
-        task->task_state_flags |= SAS_TASK_STATE_DONE;
-        task->task_state_flags &= ~SAS_TASK_AT_INITIATOR;
-        task->task_state_flags &= ~SAS_TASK_STATE_PENDING;
-}
-/**
- * isci_task_all_done() - This function clears the task bits to indicate the
- *    LLDD is done with the task.
- *
- *
- */
-static inline void isci_task_all_done(
-        struct sas_task *task)
-{
-        unsigned long flags;
-
-        /* Since no futher action will be taken on this task,
-         * make sure to mark it complete from the lldd perspective.
-         */
-        spin_lock_irqsave(&task->task_state_lock, flags);
-        isci_set_task_doneflags(task);
-        spin_unlock_irqrestore(&task->task_state_lock, flags);
-}
-
 /**
  * isci_task_set_completion_status() - This function sets the completion status
  *    for the request.
@@ -336,7 +307,9 @@ isci_task_set_completion_status(
                 /* Fall through to the normal case... */
         case isci_perform_normal_io_completion:
                 /* Normal notification (task_done) */
-                isci_set_task_doneflags(task);
+                task->task_state_flags |= SAS_TASK_STATE_DONE;
+                task->task_state_flags &= ~(SAS_TASK_AT_INITIATOR |
+                                            SAS_TASK_STATE_PENDING);
                 break;
         default:
                 WARN_ONCE(1, "unknown task_notification_selection: %d\n",