aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2007-12-30 13:37:31 -0500
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-01-11 19:29:15 -0500
commit32e8ae36b8f80372015b88b63c4358a376c9af0f (patch)
tree9a7211c761b0476216eaf24f0aebd7ced7945a37 /drivers
parent2d507a01dac338831266b44ccbb01c69e84606ed (diff)
[SCSI] libsas: don't use made up error codes
This is bad for two reasons: 1. If they're returned to outside applications, no-one knows what they mean. 2. Eventually they'll clash with the ever expanding standard error codes. The problem error code in question is ETASK. I've replaced this by ECOMM (communications error on send) a network error code that seems to most closely relay what ETASK meant. Acked-by: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/libsas/sas_ata.c2
-rw-r--r--drivers/scsi/libsas/sas_expander.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index 0829b55c64d2..adc47d481f97 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -500,7 +500,7 @@ static int sas_execute_task(struct sas_task *task, void *buffer, int size,
500 goto ex_err; 500 goto ex_err;
501 } 501 }
502 wait_for_completion(&task->completion); 502 wait_for_completion(&task->completion);
503 res = -ETASK; 503 res = -ECOMM;
504 if (task->task_state_flags & SAS_TASK_STATE_ABORTED) { 504 if (task->task_state_flags & SAS_TASK_STATE_ABORTED) {
505 int res2; 505 int res2;
506 SAS_DPRINTK("task aborted, flags:0x%x\n", 506 SAS_DPRINTK("task aborted, flags:0x%x\n",
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index 8aeaad95242c..aefd865a5788 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -96,7 +96,7 @@ static int smp_execute_task(struct domain_device *dev, void *req, int req_size,
96 } 96 }
97 97
98 wait_for_completion(&task->completion); 98 wait_for_completion(&task->completion);
99 res = -ETASK; 99 res = -ECOMM;
100 if ((task->task_state_flags & SAS_TASK_STATE_ABORTED)) { 100 if ((task->task_state_flags & SAS_TASK_STATE_ABORTED)) {
101 SAS_DPRINTK("smp task timed out or aborted\n"); 101 SAS_DPRINTK("smp task timed out or aborted\n");
102 i->dft->lldd_abort_task(task); 102 i->dft->lldd_abort_task(task);