aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndy Grover <agrover@redhat.com>2013-10-09 14:05:56 -0400
committerNicholas Bellinger <nab@linux-iscsi.org>2013-10-16 16:35:02 -0400
commitd80e224dd52dfc448e820aefa5f86c441ab76e1a (patch)
tree515f20fb3b8a16b3b7d491054e90d8baa1a7e2da /drivers
parent6b378382396feb02c79ad562a01955df0529df45 (diff)
target: Remove TF_CIT_TMPL macro
Remove a lingering macro that just hid a dereference. Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Andy Grover <agrover@redhat.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/qla2xxx/tcm_qla2xxx.c36
-rw-r--r--drivers/target/iscsi/iscsi_target_configfs.c22
-rw-r--r--drivers/target/loopback/tcm_loop.c10
-rw-r--r--drivers/target/sbp/sbp_target.c18
-rw-r--r--drivers/target/target_core_configfs.c6
-rw-r--r--drivers/target/target_core_fabric_configfs.c38
-rw-r--r--drivers/target/tcm_fc/tfc_conf.c18
-rw-r--r--drivers/usb/gadget/tcm_usb_gadget.c18
-rw-r--r--drivers/vhost/scsi.c18
9 files changed, 92 insertions, 92 deletions
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index f85b9e5c1f05..92b1654f8e20 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -1830,16 +1830,16 @@ static int tcm_qla2xxx_register_configfs(void)
1830 /* 1830 /*
1831 * Setup default attribute lists for various fabric->tf_cit_tmpl 1831 * Setup default attribute lists for various fabric->tf_cit_tmpl
1832 */ 1832 */
1833 TF_CIT_TMPL(fabric)->tfc_wwn_cit.ct_attrs = tcm_qla2xxx_wwn_attrs; 1833 fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = tcm_qla2xxx_wwn_attrs;
1834 TF_CIT_TMPL(fabric)->tfc_tpg_base_cit.ct_attrs = tcm_qla2xxx_tpg_attrs; 1834 fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = tcm_qla2xxx_tpg_attrs;
1835 TF_CIT_TMPL(fabric)->tfc_tpg_attrib_cit.ct_attrs = 1835 fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs =
1836 tcm_qla2xxx_tpg_attrib_attrs; 1836 tcm_qla2xxx_tpg_attrib_attrs;
1837 TF_CIT_TMPL(fabric)->tfc_tpg_param_cit.ct_attrs = NULL; 1837 fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;
1838 TF_CIT_TMPL(fabric)->tfc_tpg_np_base_cit.ct_attrs = NULL; 1838 fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;
1839 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_base_cit.ct_attrs = NULL; 1839 fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = NULL;
1840 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_attrib_cit.ct_attrs = NULL; 1840 fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;
1841 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_auth_cit.ct_attrs = NULL; 1841 fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;
1842 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_param_cit.ct_attrs = NULL; 1842 fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;
1843 /* 1843 /*
1844 * Register the fabric for use within TCM 1844 * Register the fabric for use within TCM
1845 */ 1845 */
@@ -1870,15 +1870,15 @@ static int tcm_qla2xxx_register_configfs(void)
1870 /* 1870 /*
1871 * Setup default attribute lists for various npiv_fabric->tf_cit_tmpl 1871 * Setup default attribute lists for various npiv_fabric->tf_cit_tmpl
1872 */ 1872 */
1873 TF_CIT_TMPL(npiv_fabric)->tfc_wwn_cit.ct_attrs = tcm_qla2xxx_wwn_attrs; 1873 npiv_fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = tcm_qla2xxx_wwn_attrs;
1874 TF_CIT_TMPL(npiv_fabric)->tfc_tpg_base_cit.ct_attrs = NULL; 1874 npiv_fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = NULL;
1875 TF_CIT_TMPL(npiv_fabric)->tfc_tpg_attrib_cit.ct_attrs = NULL; 1875 npiv_fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = NULL;
1876 TF_CIT_TMPL(npiv_fabric)->tfc_tpg_param_cit.ct_attrs = NULL; 1876 npiv_fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;
1877 TF_CIT_TMPL(npiv_fabric)->tfc_tpg_np_base_cit.ct_attrs = NULL; 1877 npiv_fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;
1878 TF_CIT_TMPL(npiv_fabric)->tfc_tpg_nacl_base_cit.ct_attrs = NULL; 1878 npiv_fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = NULL;
1879 TF_CIT_TMPL(npiv_fabric)->tfc_tpg_nacl_attrib_cit.ct_attrs = NULL; 1879 npiv_fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;
1880 TF_CIT_TMPL(npiv_fabric)->tfc_tpg_nacl_auth_cit.ct_attrs = NULL; 1880 npiv_fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;
1881 TF_CIT_TMPL(npiv_fabric)->tfc_tpg_nacl_param_cit.ct_attrs = NULL; 1881 npiv_fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;
1882 /* 1882 /*
1883 * Register the npiv_fabric for use within TCM 1883 * Register the npiv_fabric for use within TCM
1884 */ 1884 */
diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index fd145259361d..c2d504425da6 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -1995,17 +1995,17 @@ int iscsi_target_register_configfs(void)
1995 * Setup default attribute lists for various fabric->tf_cit_tmpl 1995 * Setup default attribute lists for various fabric->tf_cit_tmpl
1996 * sturct config_item_type's 1996 * sturct config_item_type's
1997 */ 1997 */
1998 TF_CIT_TMPL(fabric)->tfc_discovery_cit.ct_attrs = lio_target_discovery_auth_attrs; 1998 fabric->tf_cit_tmpl.tfc_discovery_cit.ct_attrs = lio_target_discovery_auth_attrs;
1999 TF_CIT_TMPL(fabric)->tfc_wwn_cit.ct_attrs = lio_target_wwn_attrs; 1999 fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = lio_target_wwn_attrs;
2000 TF_CIT_TMPL(fabric)->tfc_tpg_base_cit.ct_attrs = lio_target_tpg_attrs; 2000 fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = lio_target_tpg_attrs;
2001 TF_CIT_TMPL(fabric)->tfc_tpg_attrib_cit.ct_attrs = lio_target_tpg_attrib_attrs; 2001 fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = lio_target_tpg_attrib_attrs;
2002 TF_CIT_TMPL(fabric)->tfc_tpg_auth_cit.ct_attrs = lio_target_tpg_auth_attrs; 2002 fabric->tf_cit_tmpl.tfc_tpg_auth_cit.ct_attrs = lio_target_tpg_auth_attrs;
2003 TF_CIT_TMPL(fabric)->tfc_tpg_param_cit.ct_attrs = lio_target_tpg_param_attrs; 2003 fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = lio_target_tpg_param_attrs;
2004 TF_CIT_TMPL(fabric)->tfc_tpg_np_base_cit.ct_attrs = lio_target_portal_attrs; 2004 fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = lio_target_portal_attrs;
2005 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_base_cit.ct_attrs = lio_target_initiator_attrs; 2005 fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = lio_target_initiator_attrs;
2006 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_attrib_cit.ct_attrs = lio_target_nacl_attrib_attrs; 2006 fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = lio_target_nacl_attrib_attrs;
2007 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_auth_cit.ct_attrs = lio_target_nacl_auth_attrs; 2007 fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = lio_target_nacl_auth_attrs;
2008 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_param_cit.ct_attrs = lio_target_nacl_param_attrs; 2008 fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = lio_target_nacl_param_attrs;
2009 2009
2010 ret = target_fabric_configfs_register(fabric); 2010 ret = target_fabric_configfs_register(fabric);
2011 if (ret < 0) { 2011 if (ret < 0) {
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index 0f6d69dabca1..150bdb426fc4 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -1334,11 +1334,11 @@ static int tcm_loop_register_configfs(void)
1334 /* 1334 /*
1335 * Setup default attribute lists for various fabric->tf_cit_tmpl 1335 * Setup default attribute lists for various fabric->tf_cit_tmpl
1336 */ 1336 */
1337 TF_CIT_TMPL(fabric)->tfc_wwn_cit.ct_attrs = tcm_loop_wwn_attrs; 1337 fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = tcm_loop_wwn_attrs;
1338 TF_CIT_TMPL(fabric)->tfc_tpg_base_cit.ct_attrs = tcm_loop_tpg_attrs; 1338 fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = tcm_loop_tpg_attrs;
1339 TF_CIT_TMPL(fabric)->tfc_tpg_attrib_cit.ct_attrs = NULL; 1339 fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = NULL;
1340 TF_CIT_TMPL(fabric)->tfc_tpg_param_cit.ct_attrs = NULL; 1340 fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;
1341 TF_CIT_TMPL(fabric)->tfc_tpg_np_base_cit.ct_attrs = NULL; 1341 fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;
1342 /* 1342 /*
1343 * Once fabric->tf_ops has been setup, now register the fabric for 1343 * Once fabric->tf_ops has been setup, now register the fabric for
1344 * use within TCM 1344 * use within TCM
diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
index e51b09a04d52..24884cac19ce 100644
--- a/drivers/target/sbp/sbp_target.c
+++ b/drivers/target/sbp/sbp_target.c
@@ -2556,15 +2556,15 @@ static int sbp_register_configfs(void)
2556 /* 2556 /*
2557 * Setup default attribute lists for various fabric->tf_cit_tmpl 2557 * Setup default attribute lists for various fabric->tf_cit_tmpl
2558 */ 2558 */
2559 TF_CIT_TMPL(fabric)->tfc_wwn_cit.ct_attrs = sbp_wwn_attrs; 2559 fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = sbp_wwn_attrs;
2560 TF_CIT_TMPL(fabric)->tfc_tpg_base_cit.ct_attrs = sbp_tpg_base_attrs; 2560 fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = sbp_tpg_base_attrs;
2561 TF_CIT_TMPL(fabric)->tfc_tpg_attrib_cit.ct_attrs = sbp_tpg_attrib_attrs; 2561 fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = sbp_tpg_attrib_attrs;
2562 TF_CIT_TMPL(fabric)->tfc_tpg_param_cit.ct_attrs = NULL; 2562 fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;
2563 TF_CIT_TMPL(fabric)->tfc_tpg_np_base_cit.ct_attrs = NULL; 2563 fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;
2564 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_base_cit.ct_attrs = NULL; 2564 fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = NULL;
2565 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_attrib_cit.ct_attrs = NULL; 2565 fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;
2566 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_auth_cit.ct_attrs = NULL; 2566 fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;
2567 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_param_cit.ct_attrs = NULL; 2567 fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;
2568 2568
2569 ret = target_fabric_configfs_register(fabric); 2569 ret = target_fabric_configfs_register(fabric);
2570 if (ret < 0) { 2570 if (ret < 0) {
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 82e81c542e43..b04edc12f9d5 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -177,16 +177,16 @@ static struct config_group *target_core_register_fabric(
177 * struct target_fabric_configfs *tf will contain a usage reference. 177 * struct target_fabric_configfs *tf will contain a usage reference.
178 */ 178 */
179 pr_debug("Target_Core_ConfigFS: REGISTER tfc_wwn_cit -> %p\n", 179 pr_debug("Target_Core_ConfigFS: REGISTER tfc_wwn_cit -> %p\n",
180 &TF_CIT_TMPL(tf)->tfc_wwn_cit); 180 &tf->tf_cit_tmpl.tfc_wwn_cit);
181 181
182 tf->tf_group.default_groups = tf->tf_default_groups; 182 tf->tf_group.default_groups = tf->tf_default_groups;
183 tf->tf_group.default_groups[0] = &tf->tf_disc_group; 183 tf->tf_group.default_groups[0] = &tf->tf_disc_group;
184 tf->tf_group.default_groups[1] = NULL; 184 tf->tf_group.default_groups[1] = NULL;
185 185
186 config_group_init_type_name(&tf->tf_group, name, 186 config_group_init_type_name(&tf->tf_group, name,
187 &TF_CIT_TMPL(tf)->tfc_wwn_cit); 187 &tf->tf_cit_tmpl.tfc_wwn_cit);
188 config_group_init_type_name(&tf->tf_disc_group, "discovery_auth", 188 config_group_init_type_name(&tf->tf_disc_group, "discovery_auth",
189 &TF_CIT_TMPL(tf)->tfc_discovery_cit); 189 &tf->tf_cit_tmpl.tfc_discovery_cit);
190 190
191 pr_debug("Target_Core_ConfigFS: REGISTER -> Allocated Fabric:" 191 pr_debug("Target_Core_ConfigFS: REGISTER -> Allocated Fabric:"
192 " %s\n", tf->tf_group.cg_item.ci_name); 192 " %s\n", tf->tf_group.cg_item.ci_name);
diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c
index 3503996d7d10..dae2ad6a669e 100644
--- a/drivers/target/target_core_fabric_configfs.c
+++ b/drivers/target/target_core_fabric_configfs.c
@@ -385,9 +385,9 @@ static struct config_group *target_fabric_make_mappedlun(
385 } 385 }
386 386
387 config_group_init_type_name(&lacl->se_lun_group, name, 387 config_group_init_type_name(&lacl->se_lun_group, name,
388 &TF_CIT_TMPL(tf)->tfc_tpg_mappedlun_cit); 388 &tf->tf_cit_tmpl.tfc_tpg_mappedlun_cit);
389 config_group_init_type_name(&lacl->ml_stat_grps.stat_group, 389 config_group_init_type_name(&lacl->ml_stat_grps.stat_group,
390 "statistics", &TF_CIT_TMPL(tf)->tfc_tpg_mappedlun_stat_cit); 390 "statistics", &tf->tf_cit_tmpl.tfc_tpg_mappedlun_stat_cit);
391 lacl_cg->default_groups[0] = &lacl->ml_stat_grps.stat_group; 391 lacl_cg->default_groups[0] = &lacl->ml_stat_grps.stat_group;
392 lacl_cg->default_groups[1] = NULL; 392 lacl_cg->default_groups[1] = NULL;
393 393
@@ -504,16 +504,16 @@ static struct config_group *target_fabric_make_nodeacl(
504 nacl_cg->default_groups[4] = NULL; 504 nacl_cg->default_groups[4] = NULL;
505 505
506 config_group_init_type_name(&se_nacl->acl_group, name, 506 config_group_init_type_name(&se_nacl->acl_group, name,
507 &TF_CIT_TMPL(tf)->tfc_tpg_nacl_base_cit); 507 &tf->tf_cit_tmpl.tfc_tpg_nacl_base_cit);
508 config_group_init_type_name(&se_nacl->acl_attrib_group, "attrib", 508 config_group_init_type_name(&se_nacl->acl_attrib_group, "attrib",
509 &TF_CIT_TMPL(tf)->tfc_tpg_nacl_attrib_cit); 509 &tf->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit);
510 config_group_init_type_name(&se_nacl->acl_auth_group, "auth", 510 config_group_init_type_name(&se_nacl->acl_auth_group, "auth",
511 &TF_CIT_TMPL(tf)->tfc_tpg_nacl_auth_cit); 511 &tf->tf_cit_tmpl.tfc_tpg_nacl_auth_cit);
512 config_group_init_type_name(&se_nacl->acl_param_group, "param", 512 config_group_init_type_name(&se_nacl->acl_param_group, "param",
513 &TF_CIT_TMPL(tf)->tfc_tpg_nacl_param_cit); 513 &tf->tf_cit_tmpl.tfc_tpg_nacl_param_cit);
514 config_group_init_type_name(&se_nacl->acl_fabric_stat_group, 514 config_group_init_type_name(&se_nacl->acl_fabric_stat_group,
515 "fabric_statistics", 515 "fabric_statistics",
516 &TF_CIT_TMPL(tf)->tfc_tpg_nacl_stat_cit); 516 &tf->tf_cit_tmpl.tfc_tpg_nacl_stat_cit);
517 517
518 return &se_nacl->acl_group; 518 return &se_nacl->acl_group;
519} 519}
@@ -595,7 +595,7 @@ static struct config_group *target_fabric_make_np(
595 595
596 se_tpg_np->tpg_np_parent = se_tpg; 596 se_tpg_np->tpg_np_parent = se_tpg;
597 config_group_init_type_name(&se_tpg_np->tpg_np_group, name, 597 config_group_init_type_name(&se_tpg_np->tpg_np_group, name,
598 &TF_CIT_TMPL(tf)->tfc_tpg_np_base_cit); 598 &tf->tf_cit_tmpl.tfc_tpg_np_base_cit);
599 599
600 return &se_tpg_np->tpg_np_group; 600 return &se_tpg_np->tpg_np_group;
601} 601}
@@ -899,9 +899,9 @@ static struct config_group *target_fabric_make_lun(
899 } 899 }
900 900
901 config_group_init_type_name(&lun->lun_group, name, 901 config_group_init_type_name(&lun->lun_group, name,
902 &TF_CIT_TMPL(tf)->tfc_tpg_port_cit); 902 &tf->tf_cit_tmpl.tfc_tpg_port_cit);
903 config_group_init_type_name(&lun->port_stat_grps.stat_group, 903 config_group_init_type_name(&lun->port_stat_grps.stat_group,
904 "statistics", &TF_CIT_TMPL(tf)->tfc_tpg_port_stat_cit); 904 "statistics", &tf->tf_cit_tmpl.tfc_tpg_port_stat_cit);
905 lun_cg->default_groups[0] = &lun->port_stat_grps.stat_group; 905 lun_cg->default_groups[0] = &lun->port_stat_grps.stat_group;
906 lun_cg->default_groups[1] = NULL; 906 lun_cg->default_groups[1] = NULL;
907 907
@@ -1056,19 +1056,19 @@ static struct config_group *target_fabric_make_tpg(
1056 se_tpg->tpg_group.default_groups[6] = NULL; 1056 se_tpg->tpg_group.default_groups[6] = NULL;
1057 1057
1058 config_group_init_type_name(&se_tpg->tpg_group, name, 1058 config_group_init_type_name(&se_tpg->tpg_group, name,
1059 &TF_CIT_TMPL(tf)->tfc_tpg_base_cit); 1059 &tf->tf_cit_tmpl.tfc_tpg_base_cit);
1060 config_group_init_type_name(&se_tpg->tpg_lun_group, "lun", 1060 config_group_init_type_name(&se_tpg->tpg_lun_group, "lun",
1061 &TF_CIT_TMPL(tf)->tfc_tpg_lun_cit); 1061 &tf->tf_cit_tmpl.tfc_tpg_lun_cit);
1062 config_group_init_type_name(&se_tpg->tpg_np_group, "np", 1062 config_group_init_type_name(&se_tpg->tpg_np_group, "np",
1063 &TF_CIT_TMPL(tf)->tfc_tpg_np_cit); 1063 &tf->tf_cit_tmpl.tfc_tpg_np_cit);
1064 config_group_init_type_name(&se_tpg->tpg_acl_group, "acls", 1064 config_group_init_type_name(&se_tpg->tpg_acl_group, "acls",
1065 &TF_CIT_TMPL(tf)->tfc_tpg_nacl_cit); 1065 &tf->tf_cit_tmpl.tfc_tpg_nacl_cit);
1066 config_group_init_type_name(&se_tpg->tpg_attrib_group, "attrib", 1066 config_group_init_type_name(&se_tpg->tpg_attrib_group, "attrib",
1067 &TF_CIT_TMPL(tf)->tfc_tpg_attrib_cit); 1067 &tf->tf_cit_tmpl.tfc_tpg_attrib_cit);
1068 config_group_init_type_name(&se_tpg->tpg_auth_group, "auth", 1068 config_group_init_type_name(&se_tpg->tpg_auth_group, "auth",
1069 &TF_CIT_TMPL(tf)->tfc_tpg_auth_cit); 1069 &tf->tf_cit_tmpl.tfc_tpg_auth_cit);
1070 config_group_init_type_name(&se_tpg->tpg_param_group, "param", 1070 config_group_init_type_name(&se_tpg->tpg_param_group, "param",
1071 &TF_CIT_TMPL(tf)->tfc_tpg_param_cit); 1071 &tf->tf_cit_tmpl.tfc_tpg_param_cit);
1072 1072
1073 return &se_tpg->tpg_group; 1073 return &se_tpg->tpg_group;
1074} 1074}
@@ -1155,9 +1155,9 @@ static struct config_group *target_fabric_make_wwn(
1155 wwn->wwn_group.default_groups[1] = NULL; 1155 wwn->wwn_group.default_groups[1] = NULL;
1156 1156
1157 config_group_init_type_name(&wwn->wwn_group, name, 1157 config_group_init_type_name(&wwn->wwn_group, name,
1158 &TF_CIT_TMPL(tf)->tfc_tpg_cit); 1158 &tf->tf_cit_tmpl.tfc_tpg_cit);
1159 config_group_init_type_name(&wwn->fabric_stat_group, "fabric_statistics", 1159 config_group_init_type_name(&wwn->fabric_stat_group, "fabric_statistics",
1160 &TF_CIT_TMPL(tf)->tfc_wwn_fabric_stats_cit); 1160 &tf->tf_cit_tmpl.tfc_wwn_fabric_stats_cit);
1161 1161
1162 return &wwn->wwn_group; 1162 return &wwn->wwn_group;
1163} 1163}
diff --git a/drivers/target/tcm_fc/tfc_conf.c b/drivers/target/tcm_fc/tfc_conf.c
index 4e0050840a72..c6932fb53a8d 100644
--- a/drivers/target/tcm_fc/tfc_conf.c
+++ b/drivers/target/tcm_fc/tfc_conf.c
@@ -571,16 +571,16 @@ int ft_register_configfs(void)
571 /* 571 /*
572 * Setup default attribute lists for various fabric->tf_cit_tmpl 572 * Setup default attribute lists for various fabric->tf_cit_tmpl
573 */ 573 */
574 TF_CIT_TMPL(fabric)->tfc_wwn_cit.ct_attrs = ft_wwn_attrs; 574 fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = ft_wwn_attrs;
575 TF_CIT_TMPL(fabric)->tfc_tpg_base_cit.ct_attrs = NULL; 575 fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = NULL;
576 TF_CIT_TMPL(fabric)->tfc_tpg_attrib_cit.ct_attrs = NULL; 576 fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = NULL;
577 TF_CIT_TMPL(fabric)->tfc_tpg_param_cit.ct_attrs = NULL; 577 fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;
578 TF_CIT_TMPL(fabric)->tfc_tpg_np_base_cit.ct_attrs = NULL; 578 fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;
579 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_base_cit.ct_attrs = 579 fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs =
580 ft_nacl_base_attrs; 580 ft_nacl_base_attrs;
581 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_attrib_cit.ct_attrs = NULL; 581 fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;
582 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_auth_cit.ct_attrs = NULL; 582 fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;
583 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_param_cit.ct_attrs = NULL; 583 fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;
584 /* 584 /*
585 * register the fabric for use within TCM 585 * register the fabric for use within TCM
586 */ 586 */
diff --git a/drivers/usb/gadget/tcm_usb_gadget.c b/drivers/usb/gadget/tcm_usb_gadget.c
index 0ff33396eef3..9d89905e2318 100644
--- a/drivers/usb/gadget/tcm_usb_gadget.c
+++ b/drivers/usb/gadget/tcm_usb_gadget.c
@@ -1923,15 +1923,15 @@ static int usbg_register_configfs(void)
1923 } 1923 }
1924 1924
1925 fabric->tf_ops = usbg_ops; 1925 fabric->tf_ops = usbg_ops;
1926 TF_CIT_TMPL(fabric)->tfc_wwn_cit.ct_attrs = usbg_wwn_attrs; 1926 fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = usbg_wwn_attrs;
1927 TF_CIT_TMPL(fabric)->tfc_tpg_base_cit.ct_attrs = usbg_base_attrs; 1927 fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = usbg_base_attrs;
1928 TF_CIT_TMPL(fabric)->tfc_tpg_attrib_cit.ct_attrs = NULL; 1928 fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = NULL;
1929 TF_CIT_TMPL(fabric)->tfc_tpg_param_cit.ct_attrs = NULL; 1929 fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;
1930 TF_CIT_TMPL(fabric)->tfc_tpg_np_base_cit.ct_attrs = NULL; 1930 fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;
1931 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_base_cit.ct_attrs = NULL; 1931 fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = NULL;
1932 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_attrib_cit.ct_attrs = NULL; 1932 fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;
1933 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_auth_cit.ct_attrs = NULL; 1933 fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;
1934 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_param_cit.ct_attrs = NULL; 1934 fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;
1935 ret = target_fabric_configfs_register(fabric); 1935 ret = target_fabric_configfs_register(fabric);
1936 if (ret < 0) { 1936 if (ret < 0) {
1937 printk(KERN_ERR "target_fabric_configfs_register() failed" 1937 printk(KERN_ERR "target_fabric_configfs_register() failed"
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index 592b31698fc8..0225c1f5eb39 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -2163,15 +2163,15 @@ static int tcm_vhost_register_configfs(void)
2163 /* 2163 /*
2164 * Setup default attribute lists for various fabric->tf_cit_tmpl 2164 * Setup default attribute lists for various fabric->tf_cit_tmpl
2165 */ 2165 */
2166 TF_CIT_TMPL(fabric)->tfc_wwn_cit.ct_attrs = tcm_vhost_wwn_attrs; 2166 fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = tcm_vhost_wwn_attrs;
2167 TF_CIT_TMPL(fabric)->tfc_tpg_base_cit.ct_attrs = tcm_vhost_tpg_attrs; 2167 fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = tcm_vhost_tpg_attrs;
2168 TF_CIT_TMPL(fabric)->tfc_tpg_attrib_cit.ct_attrs = NULL; 2168 fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = NULL;
2169 TF_CIT_TMPL(fabric)->tfc_tpg_param_cit.ct_attrs = NULL; 2169 fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;
2170 TF_CIT_TMPL(fabric)->tfc_tpg_np_base_cit.ct_attrs = NULL; 2170 fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;
2171 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_base_cit.ct_attrs = NULL; 2171 fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = NULL;
2172 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_attrib_cit.ct_attrs = NULL; 2172 fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;
2173 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_auth_cit.ct_attrs = NULL; 2173 fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;
2174 TF_CIT_TMPL(fabric)->tfc_tpg_nacl_param_cit.ct_attrs = NULL; 2174 fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;
2175 /* 2175 /*
2176 * Register the fabric for use within TCM 2176 * Register the fabric for use within TCM
2177 */ 2177 */
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-11 06:15:24 -0500