diff options
| author | Jeff Skirvin <jeffrey.d.skirvin@intel.com> | 2012-03-09 07:42:03 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2012-05-17 23:33:41 +0200 |
| commit | 621120ca56850249554996c94efe75f8200a2cc0 (patch) | |
| tree | 892326cd79b25e0741ee271c01cc04aadb1af8ef /drivers/scsi/isci/remote_device.c | |
| parent | isci: Callbacks to libsas occur under scic_lock and are synchronized. (diff) | |
| download | linux-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/remote_device.c')
| -rw-r--r-- | drivers/scsi/isci/remote_device.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/scsi/isci/remote_device.c b/drivers/scsi/isci/remote_device.c index 21a9800a9bec..adeda64e512a 100644 --- a/drivers/scsi/isci/remote_device.c +++ b/drivers/scsi/isci/remote_device.c @@ -104,15 +104,15 @@ static enum sci_status sci_remote_device_terminate_req( int check_abort, struct isci_request *ireq) { - dev_dbg(&ihost->pdev->dev, - "%s: idev=%p; flags=%lx; req=%p; req target=%p\n", - __func__, idev, idev->flags, ireq, ireq->target_device); - if (!test_bit(IREQ_ACTIVE, &ireq->flags) || (ireq->target_device != idev) || (check_abort && !test_bit(IREQ_PENDING_ABORT, &ireq->flags))) return SCI_SUCCESS; + dev_dbg(&ihost->pdev->dev, + "%s: idev=%p; flags=%lx; req=%p; req target=%p\n", + __func__, idev, idev->flags, ireq, ireq->target_device); + set_bit(IREQ_ABORT_PATH_ACTIVE, &ireq->flags); return sci_controller_terminate_request(ihost, idev, ireq); @@ -209,11 +209,14 @@ enum sci_status isci_remote_device_terminate_requests( rnc_suspend_count, idev->rnc.suspend_count); if (ireq) { /* Terminate a specific TC. */ + set_bit(IREQ_NO_AUTO_FREE_TAG, &ireq->flags); sci_remote_device_terminate_req(ihost, idev, 0, ireq); spin_unlock_irqrestore(&ihost->scic_lock, flags); wait_event(ihost->eventq, isci_check_reqterm(ihost, idev, ireq, rnc_suspend_count)); + clear_bit(IREQ_NO_AUTO_FREE_TAG, &ireq->flags); + isci_free_tag(ihost, ireq->io_tag); } else { /* Terminate all TCs. */ sci_remote_device_terminate_requests(idev); |