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

Commit d80e224d authored by Andy Grover's avatar Andy Grover Committed by Nicholas Bellinger
Browse files

target: Remove TF_CIT_TMPL macro 



Remove a lingering macro that just hid a dereference.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndy Grover <agrover@redhat.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 6b378382

Documentation/target/tcm_mod_builder.py

+9 −9
Original line number Diff line number Diff line
@@ -440,15 +440,15 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "	/*\n"

	buf += "	 * Setup default attribute lists for various fabric->tf_cit_tmpl\n"

	buf += "	 */\n"

	buf += "	TF_CIT_TMPL(fabric)->tfc_wwn_cit.ct_attrs = " + fabric_mod_name + "_wwn_attrs;\n"

	buf += "	TF_CIT_TMPL(fabric)->tfc_tpg_base_cit.ct_attrs = NULL;\n"

	buf += "	TF_CIT_TMPL(fabric)->tfc_tpg_attrib_cit.ct_attrs = NULL;\n"

	buf += "	TF_CIT_TMPL(fabric)->tfc_tpg_param_cit.ct_attrs = NULL;\n"

	buf += "	TF_CIT_TMPL(fabric)->tfc_tpg_np_base_cit.ct_attrs = NULL;\n"

	buf += "	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_base_cit.ct_attrs = NULL;\n"

	buf += "	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;\n"

	buf += "	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_auth_cit.ct_attrs = NULL;\n"

	buf += "	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_param_cit.ct_attrs = NULL;\n"

	buf += "	fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = " + fabric_mod_name + "_wwn_attrs;\n"

	buf += "	fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = NULL;\n"

	buf += "	fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = NULL;\n"

	buf += "	fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;\n"

	buf += "	fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;\n"

	buf += "	fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = NULL;\n"

	buf += "	fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;\n"

	buf += "	fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;\n"

	buf += "	fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;\n"

	buf += "	/*\n"

	buf += "	 * Register the fabric for use within TCM\n"

	buf += "	 */\n"

drivers/scsi/qla2xxx/tcm_qla2xxx.c

+18 −18
Original line number Diff line number Diff line
@@ -1830,16 +1830,16 @@ static int tcm_qla2xxx_register_configfs(void) 
	/*

	 * Setup default attribute lists for various fabric->tf_cit_tmpl

	 */

	TF_CIT_TMPL(fabric)->tfc_wwn_cit.ct_attrs = tcm_qla2xxx_wwn_attrs;

	TF_CIT_TMPL(fabric)->tfc_tpg_base_cit.ct_attrs = tcm_qla2xxx_tpg_attrs;

	TF_CIT_TMPL(fabric)->tfc_tpg_attrib_cit.ct_attrs =

	fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = tcm_qla2xxx_wwn_attrs;

	fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = tcm_qla2xxx_tpg_attrs;

	fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs =

						tcm_qla2xxx_tpg_attrib_attrs;

	TF_CIT_TMPL(fabric)->tfc_tpg_param_cit.ct_attrs = NULL;

	TF_CIT_TMPL(fabric)->tfc_tpg_np_base_cit.ct_attrs = NULL;

	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_base_cit.ct_attrs = NULL;

	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;

	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_auth_cit.ct_attrs = NULL;

	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_param_cit.ct_attrs = NULL;

	fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;

	fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;

	fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = NULL;

	fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;

	fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;

	fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;

	/*

	 * Register the fabric for use within TCM

	 */
@@ -1870,15 +1870,15 @@ static int tcm_qla2xxx_register_configfs(void) 
	/*

	 * Setup default attribute lists for various npiv_fabric->tf_cit_tmpl

	 */

	TF_CIT_TMPL(npiv_fabric)->tfc_wwn_cit.ct_attrs = tcm_qla2xxx_wwn_attrs;

	TF_CIT_TMPL(npiv_fabric)->tfc_tpg_base_cit.ct_attrs = NULL;

	TF_CIT_TMPL(npiv_fabric)->tfc_tpg_attrib_cit.ct_attrs = NULL;

	TF_CIT_TMPL(npiv_fabric)->tfc_tpg_param_cit.ct_attrs = NULL;

	TF_CIT_TMPL(npiv_fabric)->tfc_tpg_np_base_cit.ct_attrs = NULL;

	TF_CIT_TMPL(npiv_fabric)->tfc_tpg_nacl_base_cit.ct_attrs = NULL;

	TF_CIT_TMPL(npiv_fabric)->tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;

	TF_CIT_TMPL(npiv_fabric)->tfc_tpg_nacl_auth_cit.ct_attrs = NULL;

	TF_CIT_TMPL(npiv_fabric)->tfc_tpg_nacl_param_cit.ct_attrs = NULL;

	npiv_fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = tcm_qla2xxx_wwn_attrs;

	npiv_fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = NULL;

	npiv_fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = NULL;

	npiv_fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;

	npiv_fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;

	npiv_fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = NULL;

	npiv_fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;

	npiv_fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;

	npiv_fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;

	/*

	 * Register the npiv_fabric for use within TCM

	 */

drivers/target/iscsi/iscsi_target_configfs.c

+11 −11
Original line number Diff line number Diff line
@@ -1995,17 +1995,17 @@ int iscsi_target_register_configfs(void) 
	 * Setup default attribute lists for various fabric->tf_cit_tmpl

	 * sturct config_item_type's

	 */

	TF_CIT_TMPL(fabric)->tfc_discovery_cit.ct_attrs = lio_target_discovery_auth_attrs;

	TF_CIT_TMPL(fabric)->tfc_wwn_cit.ct_attrs = lio_target_wwn_attrs;

	TF_CIT_TMPL(fabric)->tfc_tpg_base_cit.ct_attrs = lio_target_tpg_attrs;

	TF_CIT_TMPL(fabric)->tfc_tpg_attrib_cit.ct_attrs = lio_target_tpg_attrib_attrs;

	TF_CIT_TMPL(fabric)->tfc_tpg_auth_cit.ct_attrs = lio_target_tpg_auth_attrs;

	TF_CIT_TMPL(fabric)->tfc_tpg_param_cit.ct_attrs = lio_target_tpg_param_attrs;

	TF_CIT_TMPL(fabric)->tfc_tpg_np_base_cit.ct_attrs = lio_target_portal_attrs;

	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_base_cit.ct_attrs = lio_target_initiator_attrs;

	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_attrib_cit.ct_attrs = lio_target_nacl_attrib_attrs;

	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_auth_cit.ct_attrs = lio_target_nacl_auth_attrs;

	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_param_cit.ct_attrs = lio_target_nacl_param_attrs;

	fabric->tf_cit_tmpl.tfc_discovery_cit.ct_attrs = lio_target_discovery_auth_attrs;

	fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = lio_target_wwn_attrs;

	fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = lio_target_tpg_attrs;

	fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = lio_target_tpg_attrib_attrs;

	fabric->tf_cit_tmpl.tfc_tpg_auth_cit.ct_attrs = lio_target_tpg_auth_attrs;

	fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = lio_target_tpg_param_attrs;

	fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = lio_target_portal_attrs;

	fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = lio_target_initiator_attrs;

	fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = lio_target_nacl_attrib_attrs;

	fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = lio_target_nacl_auth_attrs;

	fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = lio_target_nacl_param_attrs;



	ret = target_fabric_configfs_register(fabric);

	if (ret < 0) {

drivers/target/loopback/tcm_loop.c

+5 −5
Original line number Diff line number Diff line
@@ -1334,11 +1334,11 @@ static int tcm_loop_register_configfs(void) 
	/*

	 * Setup default attribute lists for various fabric->tf_cit_tmpl

	 */

	TF_CIT_TMPL(fabric)->tfc_wwn_cit.ct_attrs = tcm_loop_wwn_attrs;

	TF_CIT_TMPL(fabric)->tfc_tpg_base_cit.ct_attrs = tcm_loop_tpg_attrs;

	TF_CIT_TMPL(fabric)->tfc_tpg_attrib_cit.ct_attrs = NULL;

	TF_CIT_TMPL(fabric)->tfc_tpg_param_cit.ct_attrs = NULL;

	TF_CIT_TMPL(fabric)->tfc_tpg_np_base_cit.ct_attrs = NULL;

	fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = tcm_loop_wwn_attrs;

	fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = tcm_loop_tpg_attrs;

	fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = NULL;

	fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;

	fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;

	/*

	 * Once fabric->tf_ops has been setup, now register the fabric for

	 * use within TCM

drivers/target/sbp/sbp_target.c

+9 −9
Original line number Diff line number Diff line
@@ -2556,15 +2556,15 @@ static int sbp_register_configfs(void) 
	/*

	 * Setup default attribute lists for various fabric->tf_cit_tmpl

	 */

	TF_CIT_TMPL(fabric)->tfc_wwn_cit.ct_attrs = sbp_wwn_attrs;

	TF_CIT_TMPL(fabric)->tfc_tpg_base_cit.ct_attrs = sbp_tpg_base_attrs;

	TF_CIT_TMPL(fabric)->tfc_tpg_attrib_cit.ct_attrs = sbp_tpg_attrib_attrs;

	TF_CIT_TMPL(fabric)->tfc_tpg_param_cit.ct_attrs = NULL;

	TF_CIT_TMPL(fabric)->tfc_tpg_np_base_cit.ct_attrs = NULL;

	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_base_cit.ct_attrs = NULL;

	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;

	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_auth_cit.ct_attrs = NULL;

	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_param_cit.ct_attrs = NULL;

	fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = sbp_wwn_attrs;

	fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = sbp_tpg_base_attrs;

	fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = sbp_tpg_attrib_attrs;

	fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;

	fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;

	fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = NULL;

	fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;

	fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;

	fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;



	ret = target_fabric_configfs_register(fabric);

	if (ret < 0) {