[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: Darrick J. Wong <djwong@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index e164f58f38593894f1d9d8a9707c3a31e3ca5032..b6535b073bf1f4714ee1f437eb3e8db7bdf7bcee 100644 (file)
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -119,6 +119,8 @@ static void sas_ata_task_done(struct sas_task *task)
        }
 
        qc->lldd_task = NULL;
+       if (qc->scsicmd)
+               ASSIGN_SAS_TASK(qc->scsicmd, NULL);
        ata_qc_complete(qc);
        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)
                break;
        }
 
+       if (qc->scsicmd)
+               ASSIGN_SAS_TASK(qc->scsicmd, task);
+
        if (sas_ha->lldd_max_execute_num < 2)
                res = i->dft->lldd_execute_task(task, 1, GFP_ATOMIC);
        else
@@ -193,6 +198,8 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
        if (res) {
                SAS_DPRINTK("lldd_execute_task returned: %d\n", res);
 
+               if (qc->scsicmd)
+                       ASSIGN_SAS_TASK(qc->scsicmd, NULL);
                sas_free_task(task);
                return AC_ERR_SYSTEM;
        }