target: remove target_core_configfs.h

6de2ce5b · Christoph Hellwig <[email protected]> · 2015-06-19 15:14:41 +02:00

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

Signed-off-by: Christoph Hellwig <[email protected]>
Reviewed-by: Andy Grover <[email protected]>
Signed-off-by: Nicholas Bellinger <[email protected]>

Commit: 6de2ce5b8cb6ff3562de34ea2584b0e501373f56
Parents: 1315c7c7

Changes

5 files changed · +34 −37

File	Status	Add	Del	Content
drivers/target/target_core_configfs.c	modified	+0	−1	View file
drivers/target/target_core_fabric_configfs.c	modified	+0	−1	View file
drivers/target/target_core_internal.h	modified	+34	−0	View file
drivers/target/target_core_tpg.c	modified	+0	−1	View file
include/target/target_core_configfs.h	deleted	+0	−34	View before deletion

drivers/target/target_core_configfs.c

View file

diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index 6003921..0b0de36 100644
--- 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"

drivers/target/target_core_fabric_configfs.c

View file

diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c
index 6cfee59..48a3698 100644
--- 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"

drivers/target/target_core_internal.h

View file

diff --git a/drivers/target/target_core_internal.h b/drivers/target/target_core_internal.h
index 5111789..99c24ac 100644
--- 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;
 

drivers/target/target_core_tpg.c

View file

diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c
index aa39bc8..10321a8 100644
--- 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"

include/target/target_core_configfs.h

View before deletion

diff --git a/include/target/target_core_configfs.h b/include/target/target_core_configfs.h
deleted file mode 100644
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;
-};