Home Home > GIT Browse > openSUSE-42.3
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-07-04 20:01:19 +0200
committerTakashi Iwai <tiwai@suse.de>2018-07-04 20:01:19 +0200
commit85464c14850b804c5c6fa42d81b3e79710efaba1 (patch)
treed795494d6c737e528330fb168a31f60bb76915b9
parent4f56444b96ef91a8aace0723826b464e10472c47 (diff)
parentb56240b78c298ff19bce1e007fba03e5049260ce (diff)
Merge branch 'users/dbond/SLE12-SP3/for-next' into SLE12-SP3
Pull qla2xxx fix from David Bond (bsc#1097501) suse-commit: 6561df890d0fbe43ad425db0cf1e80ecbed7b997
-rw-r--r--drivers/scsi/qla2xxx/qla_target.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index f86a852314a5..dd82db98046c 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -1229,7 +1229,6 @@ static void qla24xx_chk_fcp_state(struct fc_port *sess)
void qlt_schedule_sess_for_deletion(struct fc_port *sess)
{
struct qla_tgt *tgt = sess->tgt;
- struct qla_hw_data *ha = sess->vha->hw;
unsigned long flags;
if (sess->disc_state == DSC_DELETE_PEND)
@@ -1246,16 +1245,16 @@ void qlt_schedule_sess_for_deletion(struct fc_port *sess)
return;
}
- spin_lock_irqsave(&ha->tgt.sess_lock, flags);
if (sess->deleted == QLA_SESS_DELETED)
sess->logout_on_delete = 0;
+ spin_lock_irqsave(&sess->vha->work_lock, flags);
if (sess->deleted == QLA_SESS_DELETION_IN_PROGRESS) {
- spin_unlock_irqrestore(&ha->tgt.sess_lock, flags);
+ spin_unlock_irqrestore(&sess->vha->work_lock, flags);
return;
}
sess->deleted = QLA_SESS_DELETION_IN_PROGRESS;
- spin_unlock_irqrestore(&ha->tgt.sess_lock, flags);
+ spin_unlock_irqrestore(&sess->vha->work_lock, flags);
sess->disc_state = DSC_DELETE_PEND;