| From b4146c4929ef61d5afca011474d59d0918a0cd82 Mon Sep 17 00:00:00 2001 |
| From: Anil Gurumurthy <anil.gurumurthy@cavium.com> |
| Date: Wed, 18 Jul 2018 14:29:55 -0700 |
| Subject: scsi: qla2xxx: Return error when TMF returns |
| |
| From: Anil Gurumurthy <anil.gurumurthy@cavium.com> |
| |
| commit b4146c4929ef61d5afca011474d59d0918a0cd82 upstream. |
| |
| Propagate the task management completion status properly to avoid |
| unnecessary waits for commands to complete. |
| |
| Fixes: faef62d13463 ("[SCSI] qla2xxx: Fix Task Management command asynchronous handling") |
| Cc: <stable@vger.kernel.org> |
| Signed-off-by: Anil Gurumurthy <anil.gurumurthy@cavium.com> |
| Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/scsi/qla2xxx/qla_init.c | 7 +++---- |
| 1 file changed, 3 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/scsi/qla2xxx/qla_init.c |
| +++ b/drivers/scsi/qla2xxx/qla_init.c |
| @@ -329,11 +329,10 @@ qla2x00_async_tm_cmd(fc_port_t *fcport, |
| |
| wait_for_completion(&tm_iocb->u.tmf.comp); |
| |
| - rval = tm_iocb->u.tmf.comp_status == CS_COMPLETE ? |
| - QLA_SUCCESS : QLA_FUNCTION_FAILED; |
| + rval = tm_iocb->u.tmf.data; |
| |
| - if ((rval != QLA_SUCCESS) || tm_iocb->u.tmf.data) { |
| - ql_dbg(ql_dbg_taskm, vha, 0x8030, |
| + if (rval != QLA_SUCCESS) { |
| + ql_log(ql_log_warn, vha, 0x8030, |
| "TM IOCB failed (%x).\n", rval); |
| } |
| |
