diff options
| author | Giridhar Malavali <giridhar.malavali@qlogic.com> | 2013-06-25 17:27:17 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-07-08 18:16:29 +0200 |
| commit | 8edf3edd8da076008093a8a04d349bbef02ecd88 (patch) | |
| tree | 60c4bd99f3b36c580a9423a8cb22455d11fc9c6c /drivers/scsi | |
| parent | [SCSI] qla2xxx: Clear the MBX_INTR_WAIT flag when the mailbox time-out happens. (diff) | |
| download | linux-8edf3edd8da076008093a8a04d349bbef02ecd88.tar.xz linux-8edf3edd8da076008093a8a04d349bbef02ecd88.zip | |
[SCSI] qla2xxx: Set the index in outstanding command array to NULL when cmd is aborted when the request timeout.
Call the generic BSG free routine to unmap the DMA buffers.
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_bsg.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c index 39719f892488..5ba0cc1f982b 100644 --- a/drivers/scsi/qla2xxx/qla_bsg.c +++ b/drivers/scsi/qla2xxx/qla_bsg.c @@ -2153,6 +2153,7 @@ qla24xx_bsg_timeout(struct fc_bsg_job *bsg_job) (sp->type == SRB_ELS_CMD_HST) || (sp->type == SRB_FXIOCB_BCMD)) && (sp->u.bsg_job == bsg_job)) { + req->outstanding_cmds[cnt] = NULL; spin_unlock_irqrestore(&ha->hardware_lock, flags); if (ha->isp_ops->abort_command(sp)) { ql_log(ql_log_warn, vha, 0x7089, @@ -2180,8 +2181,6 @@ qla24xx_bsg_timeout(struct fc_bsg_job *bsg_job) done: spin_unlock_irqrestore(&ha->hardware_lock, flags); - if (bsg_job->request->msgcode == FC_BSG_HST_CT) - kfree(sp->fcport); - qla2x00_rel_sp(vha, sp); + sp->free(vha, sp); return 0; } |