Skip to contentSkip to conversation

sas_ata: Fix sas_ata_qc_issue to return AC_ERR_*

PATCH New Darrick J. Wong 1 participant 1 message Nov 14, 2006

Subsystems (2)
SCSI SCSI libsas
lore
Share & tools
lore

Darrick J. Wong

author
#0 lore raw

PATCH 1/1 sas_ata: Fix sas_ata_qc_issue to return AC_ERR_*

I mistakenly wrote sas_ata_qc_issue to return error codes such as ENOMEM. Since libata OR's qc->err_mask with the return value, I believe that it is necessary to make my code return one of the AC_ERR_ codes. For now I'm using AC_ERR_SYSTEM because an error here means that the command couldn't be sent to the controller. Patch is against jejb's aic94xx-sas tree.

If anybody has a suggestion for a better AC_ERR_ code to use, please suggest it.

--

Signed-off-by Darrick J. Wong <[email protected]>
drivers/scsi/libsas/sas_ata.c +4 -6
index 47fb274..9208b8b 100644
@@ -123,7 +123,7 @@ static void sas_ata_task_done(struct sas
 
 static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
 {
-	int res = -ENOMEM;
+	int res;
 	struct sas_task *task;
 	struct domain_device *dev = qc->ap->private_data;
 	struct sas_ha_struct *sas_ha = dev->port->ha;

@@ -135,7 +135,7 @@ static unsigned int sas_ata_qc_issue(str
 
 	task = sas_alloc_task(GFP_ATOMIC);
 	if (!task)
-		goto out;
+		return AC_ERR_SYSTEM;
 	task->dev = dev;
 	task->task_proto = SAS_PROTOCOL_STP;
 	task->task_done = sas_ata_task_done;

@@ -187,12 +187,10 @@ static unsigned int sas_ata_qc_issue(str
 		SAS_DPRINTK("lldd_execute_task returned: %d\n", res);
 
 		sas_free_task(task);
-		if (res == -SAS_QUEUE_FULL)
-			return -ENOMEM;
+		return AC_ERR_SYSTEM;
 	}
 
-out:
-	return res;
+	return 0;
 }
 
 static u8 sas_ata_check_status(struct ata_port *ap)