isci: Changes in isci_host_completion_routine

Changes to move management of the reqs_in_process entry for the request here.
Made changes to note when the task is already in the abort path and
cannot be completed through callbacks.

Signed-off-by: Jeff Skirvin <jeffrey.d.skirvin@intel.com>
Signed-off-by: Jacek Danecki <Jacek.Danecki@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

1 files changed, 2 insertions, 10 deletions

diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c
index 6b0863e73f22..8039f1c72f72 100644
--- a/drivers/scsi/isci/request.c
+++ b/drivers/scsi/isci/request.c
@@ -836,7 +836,7 @@ static void isci_task_save_for_upper_layer_completion(
                          status);
                 /* Add to the aborted list. */
                 list_add(&request->completed_node,
-                         &host->requests_to_abort);
+                         &host->requests_to_errorback);
                 break;
 
         default:
@@ -849,7 +849,7 @@ static void isci_task_save_for_upper_layer_completion(
 
                 /* Add to the aborted list. */
                 list_add(&request->completed_node,
-                         &host->requests_to_abort);
+                         &host->requests_to_errorback);
                 break;
         }
 }
@@ -1185,14 +1185,6 @@ void isci_request_io_request_complete(
          */
         request->sci_request_handle = NULL;
 
-        /* Only remove the request from the remote device list
-         * of pending requests if we have not requested error
-         * handling on this request.
-         */
-        if (complete_to_host != isci_perform_error_io_completion)
-                list_del_init(&request->dev_node);
-
-
         /* Save possible completion ptr. */
         io_request_completion = request->io_request_completion;