Gitlab 现已全面支持 git over ssh 与 git over https。通过 HTTPS 访问请配置带有 read_repository / write_repository 权限的 Personal access token。通过 SSH 端口访问请使用 22 端口或 13389 端口。如果使用CAS注册了账户但不知道密码，可以自行至设置中更改；如有其他问题，请发邮件至 service@cra.moe 寻求协助。

Commit 37cacc0a authored Jan 19, 2017 by Quinn Tran Committed by Nicholas Bellinger Feb 08, 2017

qla2xxx: Use d_id instead of s_id for more clarity



Updated code with d_id from s_id for better readability and
clarity.

Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
[ bvanassche: fixed spelling of patch description ]
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>

Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

parent 5e4deaf6

drivers/scsi/qla2xxx/qla_dfs.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -26,12 +26,11 @@ qla2x00_dfs_tgt_sess_show(struct seq_file s, void unused)
		seq_printf(s, "Port ID Port Name Handle\n");

		spin_lock_irqsave(&ha->tgt.sess_lock, flags);
		list_for_each_entry(sess, &tgt->sess_list, sess_list_entry) {
		list_for_each_entry(sess, &tgt->sess_list, sess_list_entry)
		seq_printf(s, "%02x:%02x:%02x %8phC %d\n",
		sess->s_id.b.domain,sess->s_id.b.area,
		sess->s_id.b.al_pa, sess->port_name,
		sess->d_id.b.domain, sess->d_id.b.area,
		sess->d_id.b.al_pa, sess->port_name,
		sess->loop_id);
		}
		spin_unlock_irqrestore(&ha->tgt.sess_lock, flags);
		}

drivers/scsi/qla2xxx/qla_target.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -530,7 +530,7 @@ static void qlt_free_session_done(struct work_struct *work)
		"%s: se_sess %p / sess %p from port %8phC loop_id %#04x"
		" s_id %02x:%02x:%02x logout %d keep %d els_logo %d\n",
		__func__, sess->se_sess, sess, sess->port_name, sess->loop_id,
		sess->s_id.b.domain, sess->s_id.b.area, sess->s_id.b.al_pa,
		sess->d_id.b.domain, sess->d_id.b.area, sess->d_id.b.al_pa,
		sess->logout_on_delete, sess->keep_nport_handle,
		sess->send_els_logo);

		@@ -538,7 +538,7 @@ static void qlt_free_session_done(struct work_struct *work)

		if (sess->send_els_logo) {
		qlt_port_logo_t logo;
		logo.id = sess->s_id;
		logo.id = sess->d_id;
		logo.cmd_count = 0;
		qlt_send_first_logo(vha, &logo);
		}
		@@ -548,7 +548,7 @@ static void qlt_free_session_done(struct work_struct *work)

		memset(&fcport, 0, sizeof(fcport));
		fcport.loop_id = sess->loop_id;
		fcport.d_id = sess->s_id;
		fcport.d_id = sess->d_id;
		memcpy(fcport.port_name, sess->port_name, WWN_SIZE);
		fcport.vha = vha;
		fcport.tgt_session = sess;
		@@ -757,7 +757,7 @@ static void qlt_schedule_sess_for_deletion(struct qla_tgt_sess *sess,
		"qla_target(%d): session for port %8phC (loop ID %d s_id %02x:%02x:%02x)"
		" scheduled for deletion in %u secs (expires: %lu) immed: %d, logout: %d, gen: %#x\n",
		sess->vha->vp_idx, sess->port_name, sess->loop_id,
		sess->s_id.b.domain, sess->s_id.b.area, sess->s_id.b.al_pa,
		sess->d_id.b.domain, sess->d_id.b.area, sess->d_id.b.al_pa,
		dev_loss_tmo, sess->expires, immediate, sess->logout_on_delete,
		sess->generation);

		@@ -892,8 +892,8 @@ static struct qla_tgt_sess *qlt_create_sess(
		ql_dbg(ql_dbg_tgt_mgt, vha, 0xf005,
		"Double sess %p found (s_id %x:%x:%x, "
		"loop_id %d), updating to d_id %x:%x:%x, "
		"loop_id %d", sess, sess->s_id.b.domain,
		sess->s_id.b.al_pa, sess->s_id.b.area,
		"loop_id %d", sess, sess->d_id.b.domain,
		sess->d_id.b.al_pa, sess->d_id.b.area,
		sess->loop_id, fcport->d_id.b.domain,
		fcport->d_id.b.al_pa, fcport->d_id.b.area,
		fcport->loop_id);
		@@ -943,7 +943,7 @@ static struct qla_tgt_sess *qlt_create_sess(
		}
		sess->tgt = vha->vha_tgt.qla_tgt;
		sess->vha = vha;
		sess->s_id = fcport->d_id;
		sess->d_id = fcport->d_id;
		sess->loop_id = fcport->loop_id;
		sess->local = local;
		kref_init(&sess->sess_kref);
		@@ -974,8 +974,8 @@ static struct qla_tgt_sess *qlt_create_sess(
		"qla_target(%d): %ssession for wwn %8phC (loop_id %d, "
		"s_id %x:%x:%x, confirmed completion %ssupported) added\n",
		vha->vp_idx, local ? "local " : "", fcport->port_name,
		fcport->loop_id, sess->s_id.b.domain, sess->s_id.b.area,
		sess->s_id.b.al_pa, sess->conf_compl_supported ? "" : "not ");
		fcport->loop_id, sess->d_id.b.domain, sess->d_id.b.area,
		sess->d_id.b.al_pa, sess->conf_compl_supported ? "" : "not ");

		/*
		* Determine if this fc_port->port_name is allowed to access
		@@ -4055,7 +4055,7 @@ qlt_find_sess_invalidate_other(struct qla_tgt *tgt, uint64_t wwn,
		}

		/* find other sess with nport_id collision */
		if (port_id.b24 == other_sess->s_id.b24) {
		if (port_id.b24 == other_sess->d_id.b24) {
		if (loop_id != other_sess->loop_id) {
		ql_dbg(ql_dbg_tgt_tmr, tgt->vha, 0x1000c,
		"Invalidating sess %p loop_id %d wwn %llx.\n",
		@@ -4216,7 +4216,7 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,
		* PLOGI and situation will correct itself.
		*/
		sess->keep_nport_handle = ((sess->loop_id == loop_id) &&
		(sess->s_id.b24 == port_id.b24));
		(sess->d_id.b24 == port_id.b24));
		qlt_schedule_sess_for_deletion(sess, true);
		break;

		@@ -4264,7 +4264,7 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,

		sess->local = 0;
		sess->loop_id = loop_id;
		sess->s_id = port_id;
		sess->d_id = port_id;

		if (wd3_lo & BIT_7)
		sess->conf_compl_supported = 1;

drivers/scsi/qla2xxx/qla_target.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -928,7 +928,7 @@ typedef struct {
		*/
		struct qla_tgt_sess {
		uint16_t loop_id;
		port_id_t s_id;
		port_id_t d_id;

		unsigned int conf_compl_supported:1;
		unsigned int deleted:2;

drivers/scsi/qla2xxx/tcm_qla2xxx.c

+22 −19

Original line number	Diff line number	Diff line
		@@ -1388,9 +1388,9 @@ static void tcm_qla2xxx_clear_sess_lookup(struct tcm_qla2xxx_lport *lport,
		struct se_session *se_sess = sess->se_sess;
		unsigned char be_sid[3];

		be_sid[0] = sess->s_id.b.domain;
		be_sid[1] = sess->s_id.b.area;
		be_sid[2] = sess->s_id.b.al_pa;
		be_sid[0] = sess->d_id.b.domain;
		be_sid[1] = sess->d_id.b.area;
		be_sid[2] = sess->d_id.b.al_pa;

		tcm_qla2xxx_set_sess_by_s_id(lport, NULL, nacl, se_sess,
		sess, be_sid);
		@@ -1442,9 +1442,9 @@ static int tcm_qla2xxx_session_cb(struct se_portal_group *se_tpg,
		unsigned long flags;
		unsigned char be_sid[3];

		be_sid[0] = qlat_sess->s_id.b.domain;
		be_sid[1] = qlat_sess->s_id.b.area;
		be_sid[2] = qlat_sess->s_id.b.al_pa;
		be_sid[0] = qlat_sess->d_id.b.domain;
		be_sid[1] = qlat_sess->d_id.b.area;
		be_sid[2] = qlat_sess->d_id.b.al_pa;

		/*
		* And now setup se_nacl and session pointers into HW lport internal
		@@ -1524,11 +1524,11 @@ static void tcm_qla2xxx_update_sess(struct qla_tgt_sess *sess, port_id_t s_id,
		u32 key;


		if (sess->loop_id != loop_id \|\| sess->s_id.b24 != s_id.b24)
		if (sess->loop_id != loop_id \|\| sess->d_id.b24 != s_id.b24)
		pr_info("Updating session %p from port %8phC loop_id %d -> %d s_id %x:%x:%x -> %x:%x:%x\n",
		sess, sess->port_name,
		sess->loop_id, loop_id, sess->s_id.b.domain,
		sess->s_id.b.area, sess->s_id.b.al_pa, s_id.b.domain,
		sess->loop_id, loop_id, sess->d_id.b.domain,
		sess->d_id.b.area, sess->d_id.b.al_pa, s_id.b.domain,
		s_id.b.area, s_id.b.al_pa);

		if (sess->loop_id != loop_id) {
		@@ -1548,18 +1548,20 @@ static void tcm_qla2xxx_update_sess(struct qla_tgt_sess *sess, port_id_t s_id,
		sess->loop_id = loop_id;
		}

		if (sess->s_id.b24 != s_id.b24) {
		key = (((u32) sess->s_id.b.domain << 16) \|
		((u32) sess->s_id.b.area << 8) \|
		((u32) sess->s_id.b.al_pa));
		if (sess->d_id.b24 != s_id.b24) {
		key = (((u32) sess->d_id.b.domain << 16) \|
		((u32) sess->d_id.b.area << 8) \|
		((u32) sess->d_id.b.al_pa));

		if (btree_lookup32(&lport->lport_fcport_map, key))
		WARN(btree_remove32(&lport->lport_fcport_map, key) != se_nacl,
		"Found wrong se_nacl when updating s_id %x:%x:%x\n",
		sess->s_id.b.domain, sess->s_id.b.area, sess->s_id.b.al_pa);
		WARN(btree_remove32(&lport->lport_fcport_map, key) !=
		se_nacl, "Found wrong se_nacl when updating s_id %x:%x:%x\n",
		sess->d_id.b.domain, sess->d_id.b.area,
		sess->d_id.b.al_pa);
		else
		WARN(1, "No lport_fcport_map entry for s_id %x:%x:%x\n",
		sess->s_id.b.domain, sess->s_id.b.area, sess->s_id.b.al_pa);
		sess->d_id.b.domain, sess->d_id.b.area,
		sess->d_id.b.al_pa);

		key = (((u32) s_id.b.domain << 16) \|
		((u32) s_id.b.area << 8) \|
		@@ -1570,10 +1572,11 @@ static void tcm_qla2xxx_update_sess(struct qla_tgt_sess *sess, port_id_t s_id,
		s_id.b.domain, s_id.b.area, s_id.b.al_pa);
		btree_update32(&lport->lport_fcport_map, key, se_nacl);
		} else {
		btree_insert32(&lport->lport_fcport_map, key, se_nacl, GFP_ATOMIC);
		btree_insert32(&lport->lport_fcport_map, key, se_nacl,
		GFP_ATOMIC);
		}

		sess->s_id = s_id;
		sess->d_id = s_id;
		nacl->nport_id = key;
		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE