releases/4.4.147/scsi-qla2xxx-return-error-when-tmf-returns.patch

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