| From ba743f9148e951abe1c94f89c174ec8e44fb145b Mon Sep 17 00:00:00 2001 |
| From: Quinn Tran <quinn.tran@cavium.com> |
| Date: Mon, 4 Dec 2017 14:45:12 -0800 |
| Subject: scsi: qla2xxx: Clear loop id after delete |
| |
| From: Quinn Tran <quinn.tran@cavium.com> |
| |
| commit ba743f9148e951abe1c94f89c174ec8e44fb145b upstream. |
| |
| Clear loop id after delete to prevent session invalidation of stale |
| session. |
| |
| Fixes: 726b85487067d ("qla2xxx: Add framework for async fabric discovery") |
| Cc: <stable@vger.kernel.org> # 4.10+ |
| Signed-off-by: Quinn Tran <quinn.tran@cavium.com> |
| Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com> |
| Reviewed-by: Hannes Reinecke <hare@suse.com> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/scsi/qla2xxx/qla_target.c | 9 ++++----- |
| 1 file changed, 4 insertions(+), 5 deletions(-) |
| |
| --- a/drivers/scsi/qla2xxx/qla_target.c |
| +++ b/drivers/scsi/qla2xxx/qla_target.c |
| @@ -974,7 +974,7 @@ static void qlt_free_session_done(struct |
| qlt_send_first_logo(vha, &logo); |
| } |
| |
| - if (sess->logout_on_delete) { |
| + if (sess->logout_on_delete && sess->loop_id != FC_NO_LOOP_ID) { |
| int rc; |
| |
| rc = qla2x00_post_async_logout_work(vha, sess, NULL); |
| @@ -1033,8 +1033,7 @@ static void qlt_free_session_done(struct |
| sess->login_succ = 0; |
| } |
| |
| - if (sess->chip_reset != ha->base_qpair->chip_reset) |
| - qla2x00_clear_loop_id(sess); |
| + qla2x00_clear_loop_id(sess); |
| |
| if (sess->conflict) { |
| sess->conflict->login_pause = 0; |
| @@ -4588,9 +4587,9 @@ qlt_find_sess_invalidate_other(scsi_qla_ |
| "Invalidating sess %p loop_id %d wwn %llx.\n", |
| other_sess, other_sess->loop_id, other_wwn); |
| |
| - |
| other_sess->keep_nport_handle = 1; |
| - *conflict_sess = other_sess; |
| + if (other_sess->disc_state != DSC_DELETED) |
| + *conflict_sess = other_sess; |
| qlt_schedule_sess_for_deletion(other_sess, |
| true); |
| } |
