Commit fe059f12 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by James Bottomley

[SCSI] sas_ata: Assign sas_task to scsi_cmnd to enable EH for ATA devices

The SATL should connect the scsi_cmnd to the sas_task (despite the presence
of libata) so that requests to abort scsi_cmnds headed to the ATA device
can be processed by the EH and aborted correctly.  The abort status should
still be propagated from sas -> ata -> scsi.
Signed-off-by: default avatarDarrick J. Wong <djwong@us.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 5986c3d3
...@@ -119,6 +119,8 @@ static void sas_ata_task_done(struct sas_task *task) ...@@ -119,6 +119,8 @@ static void sas_ata_task_done(struct sas_task *task)
} }
qc->lldd_task = NULL; qc->lldd_task = NULL;
if (qc->scsicmd)
ASSIGN_SAS_TASK(qc->scsicmd, NULL);
ata_qc_complete(qc); ata_qc_complete(qc);
spin_unlock_irqrestore(dev->sata_dev.ap->lock, flags); spin_unlock_irqrestore(dev->sata_dev.ap->lock, flags);
...@@ -184,6 +186,9 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc) ...@@ -184,6 +186,9 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
break; break;
} }
if (qc->scsicmd)
ASSIGN_SAS_TASK(qc->scsicmd, task);
if (sas_ha->lldd_max_execute_num < 2) if (sas_ha->lldd_max_execute_num < 2)
res = i->dft->lldd_execute_task(task, 1, GFP_ATOMIC); res = i->dft->lldd_execute_task(task, 1, GFP_ATOMIC);
else else
...@@ -193,6 +198,8 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc) ...@@ -193,6 +198,8 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
if (res) { if (res) {
SAS_DPRINTK("lldd_execute_task returned: %d\n", res); SAS_DPRINTK("lldd_execute_task returned: %d\n", res);
if (qc->scsicmd)
ASSIGN_SAS_TASK(qc->scsicmd, NULL);
sas_free_task(task); sas_free_task(task);
return AC_ERR_SYSTEM; return AC_ERR_SYSTEM;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment