---

yaml
---
r: 328799
b: refs/heads/master
c: 80c53e6
h: refs/heads/master
i:
  328797: 52912b4
  328795: 42e38c2
  328791: 0357ce8
  328783: c9236c7
  328767: e058e7f
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26fdf92297ee5142513b72678a19bcb3f686bb20
+refs/heads/master: 80c53e649d23c3eedb5047c4dcbe8a70b9f99202

trunk/drivers/scsi/qla4xxx/ql4_os.c

@@ -3168,18 +3168,28 @@ int qla4xxx_unblock_ddb(struct iscsi_cls_session *cls_session)
 	struct iscsi_session *sess;
 	struct ddb_entry *ddb_entry;
 	struct scsi_qla_host *ha;
+	int status = QLA_SUCCESS;
 
 	sess = cls_session->dd_data;
 	ddb_entry = sess->dd_data;
 	ha = ddb_entry->ha;
 	ql4_printk(KERN_INFO, ha, "scsi%ld: %s: ddb[%d]"
 		   " unblock user space session\n", ha->host_no, __func__,
 		   ddb_entry->fw_ddb_index);
-	iscsi_conn_start(ddb_entry->conn);
-	iscsi_conn_login_event(ddb_entry->conn,
-			       ISCSI_CONN_STATE_LOGGED_IN);
 
-	return QLA_SUCCESS;
+	if (!iscsi_is_session_online(cls_session)) {
+		iscsi_conn_start(ddb_entry->conn);
+		iscsi_conn_login_event(ddb_entry->conn,
+				       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 status;
 }
 
 static void qla4xxx_relogin_all_devices(struct scsi_qla_host *ha)