isci: Manage tag releases differently when aborting tasks.

When an individual request is being terminated, the request's tag
is managed in the terminate function.

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

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c
index c1c6dd0473ae..e798c6ae9592 100644
--- a/drivers/scsi/isci/task.c
+++ b/drivers/scsi/isci/task.c
@@ -719,7 +719,8 @@ isci_task_request_complete(struct isci_host *ihost,
          */
         set_bit(IREQ_TERMINATED, &ireq->flags);
 
-        isci_free_tag(ihost, ireq->io_tag);
+        if (!test_bit(IREQ_NO_AUTO_FREE_TAG, &ireq->flags))
+                isci_free_tag(ihost, ireq->io_tag);
 
         /* The task management part completes last. */
         if (tmf_complete)