Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80c53e64 authored Aug 07, 2012 by Manish Rangankar Committed by James Bottomley Sep 14, 2012

[SCSI] qla4xxx: Fix multiple conn login event issue during session recovery.



During iscsid session recovery driver sends multiple ISCSI_CONN_STATE_LOGGED_IN
event from qla4xxx_conn_start() and qla4xxx_ddb_change(), which causes iscsid
to crash.

Signed-off-by: Manish Rangankar <manish.rangankar@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent 26fdf922

drivers/scsi/qla4xxx/ql4_os.c

+14 −4

Original line number	Original line	Diff line number	Diff line
	@@ -3168,6 +3168,7 @@ int qla4xxx_unblock_ddb(struct iscsi_cls_session *cls_session)
	struct iscsi_session *sess;		struct iscsi_session *sess;
	struct ddb_entry *ddb_entry;		struct ddb_entry *ddb_entry;
	struct scsi_qla_host *ha;		struct scsi_qla_host *ha;
			int status = QLA_SUCCESS;

	sess = cls_session->dd_data;		sess = cls_session->dd_data;
	ddb_entry = sess->dd_data;		ddb_entry = sess->dd_data;
	@@ -3175,11 +3176,20 @@ int qla4xxx_unblock_ddb(struct iscsi_cls_session *cls_session)
	ql4_printk(KERN_INFO, ha, "scsi%ld: %s: ddb[%d]"		ql4_printk(KERN_INFO, ha, "scsi%ld: %s: ddb[%d]"
	" unblock user space session\n", ha->host_no, __func__,		" unblock user space session\n", ha->host_no, __func__,
	ddb_entry->fw_ddb_index);		ddb_entry->fw_ddb_index);

			if (!iscsi_is_session_online(cls_session)) {
	iscsi_conn_start(ddb_entry->conn);		iscsi_conn_start(ddb_entry->conn);
	iscsi_conn_login_event(ddb_entry->conn,		iscsi_conn_login_event(ddb_entry->conn,
	ISCSI_CONN_STATE_LOGGED_IN);		ISCSI_CONN_STATE_LOGGED_IN);
			} else {
			ql4_printk(KERN_INFO, ha,
			"scsi%ld: %s: ddb[%d] session [%d] already logged in\n",
			ha->host_no, __func__, ddb_entry->fw_ddb_index,
			cls_session->sid);
			status = QLA_ERROR;
			}

	return QLA_SUCCESS;		return status;
	}		}

	static void qla4xxx_relogin_all_devices(struct scsi_qla_host *ha)		static void qla4xxx_relogin_all_devices(struct scsi_qla_host *ha)