Commit b7446cac authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Nicholas Bellinger

tcm_loop: Remove SAS vestigies

tcm_loop is able to emulate several protocols, so remove last
vestigies of the SAS protocol.
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent fe052a18
...@@ -526,7 +526,7 @@ static inline struct tcm_loop_tpg *tl_tpg(struct se_portal_group *se_tpg) ...@@ -526,7 +526,7 @@ static inline struct tcm_loop_tpg *tl_tpg(struct se_portal_group *se_tpg)
static char *tcm_loop_get_endpoint_wwn(struct se_portal_group *se_tpg) static char *tcm_loop_get_endpoint_wwn(struct se_portal_group *se_tpg)
{ {
/* /*
* Return the passed NAA identifier for the SAS Target Port * Return the passed NAA identifier for the Target Port
*/ */
return &tl_tpg(se_tpg)->tl_hba->tl_wwn_address[0]; return &tl_tpg(se_tpg)->tl_hba->tl_wwn_address[0];
} }
...@@ -845,7 +845,7 @@ static int tcm_loop_make_nexus( ...@@ -845,7 +845,7 @@ static int tcm_loop_make_nexus(
transport_free_session(tl_nexus->se_sess); transport_free_session(tl_nexus->se_sess);
goto out; goto out;
} }
/* Now, register the SAS I_T Nexus as active. */ /* Now, register the I_T Nexus as active. */
transport_register_session(se_tpg, tl_nexus->se_sess->se_node_acl, transport_register_session(se_tpg, tl_nexus->se_sess->se_node_acl,
tl_nexus->se_sess, tl_nexus); tl_nexus->se_sess, tl_nexus);
tl_tpg->tl_nexus = tl_nexus; tl_tpg->tl_nexus = tl_nexus;
...@@ -884,7 +884,7 @@ static int tcm_loop_drop_nexus( ...@@ -884,7 +884,7 @@ static int tcm_loop_drop_nexus(
" %s Initiator Port: %s\n", tcm_loop_dump_proto_id(tpg->tl_hba), " %s Initiator Port: %s\n", tcm_loop_dump_proto_id(tpg->tl_hba),
tl_nexus->se_sess->se_node_acl->initiatorname); tl_nexus->se_sess->se_node_acl->initiatorname);
/* /*
* Release the SCSI I_T Nexus to the emulated SAS Target Port * Release the SCSI I_T Nexus to the emulated Target Port
*/ */
transport_deregister_session(tl_nexus->se_sess); transport_deregister_session(tl_nexus->se_sess);
tpg->tl_nexus = NULL; tpg->tl_nexus = NULL;
...@@ -1077,7 +1077,7 @@ static struct se_portal_group *tcm_loop_make_naa_tpg( ...@@ -1077,7 +1077,7 @@ static struct se_portal_group *tcm_loop_make_naa_tpg(
tl_tpg->tl_hba = tl_hba; tl_tpg->tl_hba = tl_hba;
tl_tpg->tl_tpgt = tpgt; tl_tpg->tl_tpgt = tpgt;
/* /*
* Register the tl_tpg as a emulated SAS TCM Target Endpoint * Register the tl_tpg as a emulated TCM Target Endpoint
*/ */
ret = core_tpg_register(wwn, &tl_tpg->tl_se_tpg, tl_hba->tl_proto_id); ret = core_tpg_register(wwn, &tl_tpg->tl_se_tpg, tl_hba->tl_proto_id);
if (ret < 0) if (ret < 0)
...@@ -1102,11 +1102,11 @@ static void tcm_loop_drop_naa_tpg( ...@@ -1102,11 +1102,11 @@ static void tcm_loop_drop_naa_tpg(
tl_hba = tl_tpg->tl_hba; tl_hba = tl_tpg->tl_hba;
tpgt = tl_tpg->tl_tpgt; tpgt = tl_tpg->tl_tpgt;
/* /*
* Release the I_T Nexus for the Virtual SAS link if present * Release the I_T Nexus for the Virtual target link if present
*/ */
tcm_loop_drop_nexus(tl_tpg); tcm_loop_drop_nexus(tl_tpg);
/* /*
* Deregister the tl_tpg as a emulated SAS TCM Target Endpoint * Deregister the tl_tpg as a emulated TCM Target Endpoint
*/ */
core_tpg_deregister(se_tpg); core_tpg_deregister(se_tpg);
...@@ -1199,8 +1199,9 @@ static void tcm_loop_drop_scsi_hba( ...@@ -1199,8 +1199,9 @@ static void tcm_loop_drop_scsi_hba(
struct tcm_loop_hba, tl_hba_wwn); struct tcm_loop_hba, tl_hba_wwn);
pr_debug("TCM_Loop_ConfigFS: Deallocating emulated Target" pr_debug("TCM_Loop_ConfigFS: Deallocating emulated Target"
" SAS Address: %s at Linux/SCSI Host ID: %d\n", " %s Address: %s at Linux/SCSI Host ID: %d\n",
tl_hba->tl_wwn_address, tl_hba->sh->host_no); tcm_loop_dump_proto_id(tl_hba), tl_hba->tl_wwn_address,
tl_hba->sh->host_no);
/* /*
* Call device_unregister() on the original tl_hba->dev. * Call device_unregister() on the original tl_hba->dev.
* tcm_loop_fabric_scsi.c:tcm_loop_release_adapter() will * tcm_loop_fabric_scsi.c:tcm_loop_release_adapter() will
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment