summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla4xxx/ql4_init.c
diff options
context:
space:
mode:
authorManish Rangankar <manish.rangankar@qlogic.com>2012-04-23 22:32:33 -0700
committerJames Bottomley <JBottomley@Parallels.com>2012-05-30 12:56:08 +0400
commit3d948e2a21ed8641a84ad437d2544b215d747916 (patch)
tree5a5fc4b4edcbb72fef4ed2a9cf9ac376c0a1794a /drivers/scsi/qla4xxx/ql4_init.c
parent5f50aa3ad54f3d029026d437f43324ce336dd8f5 (diff)
downloadlinux-3d948e2a21ed8641a84ad437d2544b215d747916.tar.bz2
[SCSI] qla4xxx: Fix kernel panic during discovery logout.
Update the session and connection parameter before sending connection logged in event to iscsiadm because in some scenario logout may come in just after we send the logged in event to user, which free up session, connection and ddb, but DPC is still updating session and connect parameter which can lead to panic. Signed-off-by: Manish Rangankar <manish.rangankar@qlogic.com> Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/qla4xxx/ql4_init.c')
-rw-r--r--drivers/scsi/qla4xxx/ql4_init.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index 90ee5d8fa731..05484364010e 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/drivers/scsi/qla4xxx/ql4_init.c
@@ -884,8 +884,8 @@ int qla4xxx_ddb_change(struct scsi_qla_host *ha, uint32_t fw_ddb_index,
switch (state) {
case DDB_DS_SESSION_ACTIVE:
case DDB_DS_DISCOVERY:
- ddb_entry->unblock_sess(ddb_entry->sess);
qla4xxx_update_session_conn_param(ha, ddb_entry);
+ ddb_entry->unblock_sess(ddb_entry->sess);
status = QLA_SUCCESS;
break;
case DDB_DS_SESSION_FAILED:
@@ -897,6 +897,7 @@ int qla4xxx_ddb_change(struct scsi_qla_host *ha, uint32_t fw_ddb_index,
}
break;
case DDB_DS_SESSION_ACTIVE:
+ case DDB_DS_DISCOVERY:
switch (state) {
case DDB_DS_SESSION_FAILED:
/*