target: remove target_core_configfs.h

The remaining defintions are private to the target core and can be merged
into target_core_internal.h.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Andy Grover <agrover@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 6003921a1c563228e36a46927cc7143a4b40050f..0b0de36474784987c781906243eabbed27ecab00 100644 (file)
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -41,7 +41,6 @@
 #include <target/target_core_backend.h>
 #include <target/target_core_fabric.h>
 #include <target/target_core_fabric_configfs.h>
-#include <target/target_core_configfs.h>
 #include <target/configfs_macros.h>
 
 #include "target_core_internal.h"

diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c
index 6cfee595f3f2eac223da29f6d1cab4208ce2e79c..48a36989c1a659408b5a1a58bbb97a0989576055 100644 (file)
--- a/drivers/target/target_core_fabric_configfs.c
+++ b/drivers/target/target_core_fabric_configfs.c
@@ -36,7 +36,6 @@
 #include <target/target_core_base.h>
 #include <target/target_core_fabric.h>
 #include <target/target_core_fabric_configfs.h>
-#include <target/target_core_configfs.h>
 #include <target/configfs_macros.h>
 
 #include "target_core_internal.h"

diff --git a/drivers/target/target_core_internal.h b/drivers/target/target_core_internal.h
index 511178969df321f8d1d5489de78ace1c5a9d8c8b..99c24acfe6761797fc9788f4f233d1c8c94a0e1d 100644 (file)
--- a/drivers/target/target_core_internal.h
+++ b/drivers/target/target_core_internal.h
@@ -1,6 +1,9 @@
 #ifndef TARGET_CORE_INTERNAL_H
 #define TARGET_CORE_INTERNAL_H
 
+#define TARGET_CORE_NAME_MAX_LEN       64
+#define TARGET_FABRIC_NAME_SIZE                32
+
 struct target_backend {
        struct list_head list;
 
@@ -14,6 +17,37 @@ struct target_backend {
        struct config_item_type tb_dev_stat_cit;
 };
 
+struct target_fabric_configfs {
+       atomic_t                tf_access_cnt;
+       struct list_head        tf_list;
+       struct config_group     tf_group;
+       struct config_group     tf_disc_group;
+       struct config_group     *tf_default_groups[2];
+       const struct target_core_fabric_ops *tf_ops;
+
+       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;
+};
+
 /* target_core_alua.c */
 extern struct t10_alua_lu_gp *default_lu_gp;
 

diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c
index aa39bc89227be4765a758c251be16bb6feac8b98..10321a8ffbb01a985f2988bc0f0e75cfe0467204 100644 (file)
--- a/drivers/target/target_core_tpg.c
+++ b/drivers/target/target_core_tpg.c
@@ -37,7 +37,6 @@
 
 #include <target/target_core_base.h>
 #include <target/target_core_backend.h>
-#include <target/target_core_configfs.h>
 #include <target/target_core_fabric.h>
 
 #include "target_core_internal.h"

diff --git a/include/target/target_core_configfs.h b/include/target/target_core_configfs.h
deleted file mode 100644 (file)
index d19dbee..0000000
--- a/include/target/target_core_configfs.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-#define TARGET_CORE_NAME_MAX_LEN       64
-#define TARGET_FABRIC_NAME_SIZE                32
-
-struct target_fabric_configfs {
-       atomic_t                tf_access_cnt;
-       struct list_head        tf_list;
-       struct config_group     tf_group;
-       struct config_group     tf_disc_group;
-       struct config_group     *tf_default_groups[2];
-       const struct target_core_fabric_ops *tf_ops;
-
-       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;
-};