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

Commit 59a206b4 authored by David Disseldorp's avatar David Disseldorp Committed by Martin K. Petersen
Browse files

scsi: target: replace fabric_ops.name with fabric_alias 



iscsi_target_mod is the only LIO fabric where fabric_ops.name differs from
the fabric_ops.fabric_name string.  fabric_ops.name is used when matching
target/$fabric ConfigFS create paths, so rename it .fabric_alias and
fallback to target/$fabric vs .fabric_name comparison if .fabric_alias
isn't initialised.  iscsi_target_mod is the only fabric module to set
.fabric_alias . All other fabric modules rely on .fabric_name matching and
can drop the duplicate string.

Signed-off-by: default avatarDavid Disseldorp <ddiss@suse.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 30c7ca93

drivers/infiniband/ulp/srpt/ib_srpt.c

+0 −1
Original line number Diff line number Diff line
@@ -3673,7 +3673,6 @@ static struct configfs_attribute *srpt_wwn_attrs[] = { 


static const struct target_core_fabric_ops srpt_template = {

	.module				= THIS_MODULE,

	.name				= "srpt",

	.fabric_name			= "srpt",

	.tpg_get_wwn			= srpt_get_fabric_wwn,

	.tpg_get_tag			= srpt_get_tag,

drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c

+0 −1
Original line number Diff line number Diff line
@@ -4039,7 +4039,6 @@ static struct configfs_attribute *ibmvscsis_tpg_attrs[] = { 


static const struct target_core_fabric_ops ibmvscsis_ops = {

	.module				= THIS_MODULE,

	.name				= "ibmvscsis",

	.fabric_name			= "ibmvscsis",

	.max_data_sg_nents		= MAX_TXU / PAGE_SIZE,

	.tpg_get_wwn			= ibmvscsis_get_fabric_wwn,

drivers/scsi/qla2xxx/tcm_qla2xxx.c

+0 −2
Original line number Diff line number Diff line
@@ -1910,7 +1910,6 @@ static struct configfs_attribute *tcm_qla2xxx_wwn_attrs[] = { 


static const struct target_core_fabric_ops tcm_qla2xxx_ops = {

	.module				= THIS_MODULE,

	.name				= "qla2xxx",

	.fabric_name			= "qla2xxx",

	.node_acl_size			= sizeof(struct tcm_qla2xxx_nacl),

	/*
@@ -1959,7 +1958,6 @@ static const struct target_core_fabric_ops tcm_qla2xxx_ops = { 


static const struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = {

	.module				= THIS_MODULE,

	.name				= "qla2xxx_npiv",

	.fabric_name			= "qla2xxx_npiv",

	.node_acl_size			= sizeof(struct tcm_qla2xxx_nacl),

	.tpg_get_wwn			= tcm_qla2xxx_get_fabric_wwn,

drivers/target/iscsi/iscsi_target_configfs.c

+1 −1
Original line number Diff line number Diff line
@@ -1544,7 +1544,7 @@ static void lio_release_cmd(struct se_cmd *se_cmd) 


const struct target_core_fabric_ops iscsi_ops = {

	.module				= THIS_MODULE,

	.name				= "iscsi",

	.fabric_alias			= "iscsi",

	.fabric_name			= "iSCSI",

	.node_acl_size			= sizeof(struct iscsi_node_acl),

	.tpg_get_wwn			= lio_tpg_get_endpoint_wwn,

drivers/target/loopback/tcm_loop.c

+0 −1
Original line number Diff line number Diff line
@@ -1144,7 +1144,6 @@ static struct configfs_attribute *tcm_loop_wwn_attrs[] = { 


static const struct target_core_fabric_ops loop_ops = {

	.module				= THIS_MODULE,

	.name				= "loopback",

	.fabric_name			= "loopback",

	.tpg_get_wwn			= tcm_loop_get_endpoint_wwn,

	.tpg_get_tag			= tcm_loop_get_tag,