diff options
| author | Jeff Skirvin | 2011-09-29 03:47:46 +0200 |
|---|---|---|
| committer | James Bottomley | 2011-10-02 20:21:24 +0200 |
| commit | cd06b9bae18c64658d5a86526fb19cfe0ea8814f (patch) | |
| tree | ef755cca6da001bf2972acb7f649bb6bf995e922 | |
| parent | [SCSI] isci: atapi support (diff) | |
| download | kernel-qcow2-linux-cd06b9bae18c64658d5a86526fb19cfe0ea8814f.tar.gz kernel-qcow2-linux-cd06b9bae18c64658d5a86526fb19cfe0ea8814f.tar.xz kernel-qcow2-linux-cd06b9bae18c64658d5a86526fb19cfe0ea8814f.zip | |
[SCSI] isci: SATA/STP I/O is only returned in the normal path to libsas
Since libsas has it's own means to escalate SATA/STP device error
handling depending on task status codes, return all SATA/STP I/O
on the normal path.
i.e. skip sas_task_abort() and let sas_ata_task_done() disposition the
qc. Longer term we want to audit non-essential calls to
sas_task_abort().
Signed-off-by: Jeff Skirvin <jeffrey.d.skirvin@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
| -rw-r--r-- | drivers/scsi/isci/task.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/scsi/isci/task.h b/drivers/scsi/isci/task.h index 4a7fa90287ef..15b18d158993 100644 --- a/drivers/scsi/isci/task.h +++ b/drivers/scsi/isci/task.h @@ -286,6 +286,25 @@ isci_task_set_completion_status( task->task_status.resp = response; task->task_status.stat = status; + switch (task->task_proto) { + + case SAS_PROTOCOL_SATA: + case SAS_PROTOCOL_STP: + case SAS_PROTOCOL_SATA | SAS_PROTOCOL_STP: + + if (task_notification_selection + == isci_perform_error_io_completion) { + /* SATA/STP I/O has it's own means of scheduling device + * error handling on the normal path. + */ + task_notification_selection + = isci_perform_normal_io_completion; + } + break; + default: + break; + } + switch (task_notification_selection) { case isci_perform_error_io_completion: |