target: remove struct target_fabric_configfs_template

[deliverable/linux.git] / include / target / target_core_configfs.h

diff --git a/include/target/target_core_configfs.h b/include/target/target_core_configfs.h
index 3f11d2ead63dd7ab2115c66f489f5df866cc9903..abd063b8b301fce4711b28eb10a12d1fd985d354 100644 (file)
--- a/include/target/target_core_configfs.h
+++ b/include/target/target_core_configfs.h
@@ -5,30 +5,6 @@
 #define TARGET_CORE_NAME_MAX_LEN       64
 #define TARGET_FABRIC_NAME_SIZE                32
 
-struct target_fabric_configfs_template {
-       struct config_item_type tfc_discovery_cit;
-       struct config_item_type tfc_wwn_cit;
-       struct config_item_type tfc_wwn_fabric_stats_cit;
-       struct config_item_type tfc_tpg_cit;
-       struct config_item_type tfc_tpg_base_cit;
-       struct config_item_type tfc_tpg_lun_cit;
-       struct config_item_type tfc_tpg_port_cit;
-       struct config_item_type tfc_tpg_port_stat_cit;
-       struct config_item_type tfc_tpg_np_cit;
-       struct config_item_type tfc_tpg_np_base_cit;
-       struct config_item_type tfc_tpg_attrib_cit;
-       struct config_item_type tfc_tpg_auth_cit;
-       struct config_item_type tfc_tpg_param_cit;
-       struct config_item_type tfc_tpg_nacl_cit;
-       struct config_item_type tfc_tpg_nacl_base_cit;
-       struct config_item_type tfc_tpg_nacl_attrib_cit;
-       struct config_item_type tfc_tpg_nacl_auth_cit;
-       struct config_item_type tfc_tpg_nacl_param_cit;
-       struct config_item_type tfc_tpg_nacl_stat_cit;
-       struct config_item_type tfc_tpg_mappedlun_cit;
-       struct config_item_type tfc_tpg_mappedlun_stat_cit;
-};
-
 struct target_fabric_configfs {
        atomic_t                tf_access_cnt;
        struct list_head        tf_list;
@@ -36,6 +12,26 @@ struct target_fabric_configfs {
        struct config_group     tf_disc_group;
        struct config_group     *tf_default_groups[2];
        const struct target_core_fabric_ops *tf_ops;
-       struct target_fabric_configfs_template tf_cit_tmpl;
-};
 
+       struct config_item_type tf_discovery_cit;
+       struct config_item_type tf_wwn_cit;
+       struct config_item_type tf_wwn_fabric_stats_cit;
+       struct config_item_type tf_tpg_cit;
+       struct config_item_type tf_tpg_base_cit;
+       struct config_item_type tf_tpg_lun_cit;
+       struct config_item_type tf_tpg_port_cit;
+       struct config_item_type tf_tpg_port_stat_cit;
+       struct config_item_type tf_tpg_np_cit;
+       struct config_item_type tf_tpg_np_base_cit;
+       struct config_item_type tf_tpg_attrib_cit;
+       struct config_item_type tf_tpg_auth_cit;
+       struct config_item_type tf_tpg_param_cit;
+       struct config_item_type tf_tpg_nacl_cit;
+       struct config_item_type tf_tpg_nacl_base_cit;
+       struct config_item_type tf_tpg_nacl_attrib_cit;
+       struct config_item_type tf_tpg_nacl_auth_cit;
+       struct config_item_type tf_tpg_nacl_param_cit;
+       struct config_item_type tf_tpg_nacl_stat_cit;
+       struct config_item_type tf_tpg_mappedlun_cit;
+       struct config_item_type tf_tpg_mappedlun_stat_cit;
+};