summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/host.c
diff options
context:
space:
mode:
authorJeff Skirvin <jeffrey.d.skirvin@intel.com>2012-03-09 07:42:03 +0100
committerDan Williams <dan.j.williams@intel.com>2012-05-17 23:33:41 +0200
commit621120ca56850249554996c94efe75f8200a2cc0 (patch)
tree892326cd79b25e0741ee271c01cc04aadb1af8ef /drivers/scsi/isci/host.c
parentisci: Callbacks to libsas occur under scic_lock and are synchronized. (diff)
downloadlinux-621120ca56850249554996c94efe75f8200a2cc0.tar.xz
linux-621120ca56850249554996c94efe75f8200a2cc0.zip
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>
Diffstat (limited to 'drivers/scsi/isci/host.c')
-rw-r--r--drivers/scsi/isci/host.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c
index 53c3ad64c998..ef2790faeab8 100644
--- a/drivers/scsi/isci/host.c
+++ b/drivers/scsi/isci/host.c
@@ -1141,7 +1141,8 @@ void isci_host_completion_routine(unsigned long data)
if (test_and_clear_bit(IREQ_ABORT_PATH_ACTIVE, &request->flags))
wake_up_all(&ihost->eventq);
- isci_free_tag(ihost, request->io_tag);
+ if (!test_bit(IREQ_NO_AUTO_FREE_TAG, &request->flags))
+ isci_free_tag(ihost, request->io_tag);
}
spin_unlock_irq(&ihost->scic_lock);