mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-20 06:06:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2019-04-21 07:57:59 -07:00
parent 6ac9522589 f42279201b
commit 78938fde8e
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c
+16 -15
View File
@@ -816,6 +816,8 @@ static int sqa_qla2xxx_check_initiator_node_acl(scsi_qla_host_t *vha,
goto free_sess;
}
res = 0;
spin_lock_irqsave(&vha->hw->tgt.sess_lock, flags);
se_sess->fabric_sess_ptr = scst_sess;
fcport->se_sess = se_sess;
@@ -883,7 +885,7 @@ static void sqa_qla2xxx_clear_nacl_from_fcport_map(struct fc_port *sess)
static void sqa_qla2xxx_release_sess(struct kref *kref)
{
struct fc_port *fcport = container_of(kref, struct fc_port,sess_kref);
struct fc_port *fcport = container_of(kref, struct fc_port, sess_kref);
qlt_unreg_sess(fcport);
@@ -902,7 +904,7 @@ static void sqa_qla2xxx_put_sess(struct fc_port *sess)
static int sqa_close_session(struct scst_session *scst_sess)
{
struct fc_port *fcport= (struct fc_port*)scst_sess_get_tgt_priv(scst_sess);
struct fc_port *fcport = scst_sess_get_tgt_priv(scst_sess);
unsigned long flags;
struct qla_hw_data *ha = fcport->vha->hw;
@@ -974,7 +976,7 @@ static ssize_t sqa_node_name_show(struct kobject *kobj,
uint8_t *node_name;
scst_tgt = container_of(kobj, struct scst_tgt, tgt_kobj);
sqa_tgt = (struct sqa_scst_tgt *)scst_tgt_get_tgt_priv(scst_tgt);
sqa_tgt = scst_tgt_get_tgt_priv(scst_tgt);
mutex_lock(&sqa_mutex);
if (!sqa_tgt || !sqa_tgt->qla_tgt) {
@@ -1020,7 +1022,7 @@ static ssize_t sqa_node_name_store(struct kobject *kobj,
TRACE_ENTRY();
scst_tgt = container_of(kobj, struct scst_tgt, tgt_kobj);
sqa_tgt = (struct sqa_scst_tgt *)scst_tgt_get_tgt_priv(scst_tgt);
sqa_tgt = scst_tgt_get_tgt_priv(scst_tgt);
tgt = sqa_tgt->qla_tgt;
ha = tgt->ha;
@@ -1085,7 +1087,7 @@ static ssize_t sqa_vp_parent_host_show(struct kobject *kobj,
char *wwn;
scst_tgt = container_of(kobj, struct scst_tgt, tgt_kobj);
sqa_tgt = (struct sqa_scst_tgt *)scst_tgt_get_tgt_priv(scst_tgt);
sqa_tgt = scst_tgt_get_tgt_priv(scst_tgt);
tgt = sqa_tgt->qla_tgt;
ha = tgt->ha;
@@ -1113,7 +1115,7 @@ static ssize_t sqa_show_expl_conf_enabled(struct kobject *kobj,
ssize_t size;
scst_tgt = container_of(kobj, struct scst_tgt, tgt_kobj);
sqa_tgt = (struct sqa_scst_tgt *)scst_tgt_get_tgt_priv(scst_tgt);
sqa_tgt = scst_tgt_get_tgt_priv(scst_tgt);
tgt = sqa_tgt->qla_tgt;
ha = tgt->ha;
@@ -1137,7 +1139,7 @@ static ssize_t sqa_store_expl_conf_enabled(struct kobject *kobj,
unsigned long flags;
scst_tgt = container_of(kobj, struct scst_tgt, tgt_kobj);
sqa_tgt = (struct sqa_scst_tgt *)scst_tgt_get_tgt_priv(scst_tgt);
sqa_tgt = scst_tgt_get_tgt_priv(scst_tgt);
tgt = sqa_tgt->qla_tgt;
ha = tgt->ha;
vha = tgt->vha;
@@ -1178,7 +1180,7 @@ static ssize_t sqa_abort_isp_store(struct kobject *kobj,
TRACE_ENTRY();
scst_tgt = container_of(kobj, struct scst_tgt, tgt_kobj);
sqa_tgt = (struct sqa_scst_tgt *)scst_tgt_get_tgt_priv(scst_tgt);
sqa_tgt = scst_tgt_get_tgt_priv(scst_tgt);
tgt = sqa_tgt->qla_tgt;
PRINT_INFO("sqatgt(%ld/%d) ISP abort not implemented.",
@@ -1194,7 +1196,7 @@ static ssize_t sqa_abort_isp_store(struct kobject *kobj,
struct qla_hw_data *ha;
scst_tgt = container_of(kobj, struct scst_tgt, tgt_kobj);
sqa_tgt = (struct sqa_scst_tgt *)scst_tgt_get_tgt_priv(scst_tgt);
sqa_tgt = scst_tgt_get_tgt_priv(scst_tgt);
tgt = sqa_tgt->qla_tgt;
ha = tgt->ha;
@@ -1469,7 +1471,7 @@ static void sqa_qla2xxx_remove_target(struct scsi_qla_host *vha)
*/
static int sqa_target_release(struct scst_tgt *scst_tgt)
{
struct sqa_scst_tgt *sqa_tgt = (struct sqa_scst_tgt *)scst_tgt_get_tgt_priv(scst_tgt);
struct sqa_scst_tgt *sqa_tgt = scst_tgt_get_tgt_priv(scst_tgt);
struct qla_tgt *tgt = sqa_tgt->qla_tgt;
struct scsi_qla_host *vha= tgt->vha;
@@ -1627,7 +1629,7 @@ static int sqa_rdy_to_xfer(struct scst_cmd *scst_cmd)
struct qla_tgt_cmd *cmd;
TRACE_ENTRY();
cmd = (struct qla_tgt_cmd *)scst_cmd_get_tgt_priv(scst_cmd);
cmd = scst_cmd_get_tgt_priv(scst_cmd);
TRACE(TRACE_SCSI, "sqatgt(%ld/%d): tag=%lld", cmd->vha->host_no,
cmd->vha->vp_idx, scst_cmd_get_tag(scst_cmd));
@@ -1685,8 +1687,7 @@ static int sqa_rdy_to_xfer(struct scst_cmd *scst_cmd)
static void sqa_on_free_cmd(struct scst_cmd *scst_cmd)
{
struct qla_tgt_cmd *cmd =
(struct qla_tgt_cmd *)scst_cmd_get_tgt_priv(scst_cmd);
struct qla_tgt_cmd *cmd = scst_cmd_get_tgt_priv(scst_cmd);
TRACE_ENTRY();
@@ -1975,7 +1976,7 @@ static int sqa_enable_tgt(struct scst_tgt *scst_tgt, bool enable)
TRACE_ENTRY();
sqa_tgt = (struct sqa_scst_tgt *)scst_tgt_get_tgt_priv(scst_tgt);
sqa_tgt = scst_tgt_get_tgt_priv(scst_tgt);
tgt = sqa_tgt->qla_tgt;
vha = tgt->vha;
if (enable && (qla_tgt_mode_enabled(tgt->vha) ||
@@ -2020,7 +2021,7 @@ static bool sqa_is_tgt_enabled(struct scst_tgt *scst_tgt)
struct sqa_scst_tgt *sqa_tgt;
TRACE_ENTRY();
sqa_tgt = (struct sqa_scst_tgt *)scst_tgt_get_tgt_priv(scst_tgt);
sqa_tgt = scst_tgt_get_tgt_priv(scst_tgt);
tgt = sqa_tgt->qla_tgt;
res = qla_tgt_mode_enabled(tgt->vha) || qla_dual_mode_enabled(tgt->vha);
qla2x00t-32gbit/qla_init.c
+1 -2
View File
@@ -5280,8 +5280,7 @@ qla2x00_reg_remote_port(scsi_qla_host_t *vha, fc_port_t *fcport)
if (fcport->port_type == FCT_TARGET)
rport_ids.roles |= FC_RPORT_ROLE_FCP_TARGET;
ql_dbg(ql_dbg_disc, vha, 0x20ee,
"%s %8phN. rport %p is %s mode\n",
ql_dbg(ql_dbg_disc, vha, 0x20ee, "%s %s. rport %p is %s mode\n",
__func__, wwn_to_str(fcport->port_name), rport,
(fcport->port_type == FCT_TARGET) ? "tgt" : "ini");