releases/4.15.10/scsi-qla2xxx-clear-loop-id-after-delete.patch

   1 From ba743f9148e951abe1c94f89c174ec8e44fb145b Mon Sep 17 00:00:00 2001
   2 From: Quinn Tran <quinn.tran@cavium.com>
   3 Date: Mon, 4 Dec 2017 14:45:12 -0800
   4 Subject: scsi: qla2xxx: Clear loop id after delete
   5
   6 From: Quinn Tran <quinn.tran@cavium.com>
   7
   8 commit ba743f9148e951abe1c94f89c174ec8e44fb145b upstream.
   9
  10 Clear loop id after delete to prevent session invalidation of stale
  11 session.
  12
  13 Fixes: 726b85487067d ("qla2xxx: Add framework for async fabric discovery")
  14 Cc: <stable@vger.kernel.org> # 4.10+
  15 Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
  16 Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
  17 Reviewed-by: Hannes Reinecke <hare@suse.com>
  18 Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
  19 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  20
  21 ---
  22  drivers/scsi/qla2xxx/qla_target.c |    9 ++++-----
  23  1 file changed, 4 insertions(+), 5 deletions(-)
  24
  25 --- a/drivers/scsi/qla2xxx/qla_target.c
  26 +++ b/drivers/scsi/qla2xxx/qla_target.c
  27 @@ -985,7 +985,7 @@ static void qlt_free_session_done(struct
  28                         qlt_send_first_logo(vha, &logo);
  29                 }
  30
  31 -               if (sess->logout_on_delete) {
  32 +               if (sess->logout_on_delete && sess->loop_id != FC_NO_LOOP_ID) {
  33                         int rc;
  34
  35                         rc = qla2x00_post_async_logout_work(vha, sess, NULL);
  36 @@ -1044,8 +1044,7 @@ static void qlt_free_session_done(struct
  37                 sess->login_succ = 0;
  38         }
  39
  40 -       if (sess->chip_reset != ha->base_qpair->chip_reset)
  41 -               qla2x00_clear_loop_id(sess);
  42 +       qla2x00_clear_loop_id(sess);
  43
  44         if (sess->conflict) {
  45                 sess->conflict->login_pause = 0;
  46 @@ -4599,9 +4598,9 @@ qlt_find_sess_invalidate_other(scsi_qla_
  47                                     "Invalidating sess %p loop_id %d wwn %llx.\n",
  48                                     other_sess, other_sess->loop_id, other_wwn);
  49
  50 -
  51                                 other_sess->keep_nport_handle = 1;
  52 -                               *conflict_sess = other_sess;
  53 +                               if (other_sess->disc_state != DSC_DELETED)
  54 +                                       *conflict_sess = other_sess;
  55                                 qlt_schedule_sess_for_deletion(other_sess,
  56                                     true);
  57                         }