diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-08-12 11:43:45 +0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-08-12 11:43:45 +0400 |
| commit | cada23f308e3869ceb5c75f164d249448dfaec07 (patch) | |
| tree | 97c7aebcad0eb2a93a7519251a01f5be9255ee75 /drivers/scsi/isci/task.c | |
| parent | e769ece3b129698d2b09811a6f6d304e4eaa8c29 (diff) | |
| parent | 6c8c0c4dc0e98ee2191211d66e9f876e95787073 (diff) | |
| download | linux-cada23f308e3869ceb5c75f164d249448dfaec07.tar.xz | |
Merge branch 'kvm-arm64/fixes-3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into kvm-master
Diffstat (limited to 'drivers/scsi/isci/task.c')
| -rw-r--r-- | drivers/scsi/isci/task.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c index 9bb020ac089c..0d30ca849e8f 100644 --- a/drivers/scsi/isci/task.c +++ b/drivers/scsi/isci/task.c @@ -491,6 +491,7 @@ int isci_task_abort_task(struct sas_task *task) struct isci_tmf tmf; int ret = TMF_RESP_FUNC_FAILED; unsigned long flags; + int target_done_already = 0; /* Get the isci_request reference from the task. Note that * this check does not depend on the pending request list @@ -505,9 +506,11 @@ int isci_task_abort_task(struct sas_task *task) /* If task is already done, the request isn't valid */ if (!(task->task_state_flags & SAS_TASK_STATE_DONE) && (task->task_state_flags & SAS_TASK_AT_INITIATOR) && - old_request) + old_request) { idev = isci_get_device(task->dev->lldd_dev); - + target_done_already = test_bit(IREQ_COMPLETE_IN_TARGET, + &old_request->flags); + } spin_unlock(&task->task_state_lock); spin_unlock_irqrestore(&ihost->scic_lock, flags); @@ -561,7 +564,7 @@ int isci_task_abort_task(struct sas_task *task) if (task->task_proto == SAS_PROTOCOL_SMP || sas_protocol_ata(task->task_proto) || - test_bit(IREQ_COMPLETE_IN_TARGET, &old_request->flags) || + target_done_already || test_bit(IDEV_GONE, &idev->flags)) { spin_unlock_irqrestore(&ihost->scic_lock, flags); |