diff options
author | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-02-09 18:35:03 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2011-02-12 13:15:47 -0500 |
commit | e89d15eeadb172bd53ca6362bf9ab6b22077224c (patch) | |
tree | d7b5716ed3ccc80a4b3863305d6a0f8284ce49e4 /drivers/target/target_core_configfs.c | |
parent | e63af95888894af6ca4112dc90083d1dff0fec29 (diff) |
[SCSI] target: Remove procfs based target_core_mib.c code
This patch removes the legacy procfs based target_core_mib.c code,
and moves the necessary scsi_index_tables functions and defines into
target_core_transport.c and target_core_base.h code to allow existing
fabric independent statistics to function.
This includes the removal of a handful of 'atomic_t mib_ref_count'
counters used in struct se_node_acl, se_session and se_hba to prevent
removal while using seq_list procfs walking logic.
[jejb: fix up compile failures]
Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/target/target_core_configfs.c')
-rw-r--r-- | drivers/target/target_core_configfs.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c index 1cb74d57ed5..e77001b1606 100644 --- a/drivers/target/target_core_configfs.c +++ b/drivers/target/target_core_configfs.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #include <linux/parser.h> | 37 | #include <linux/parser.h> |
38 | #include <linux/syscalls.h> | 38 | #include <linux/syscalls.h> |
39 | #include <linux/configfs.h> | 39 | #include <linux/configfs.h> |
40 | #include <linux/proc_fs.h> | ||
41 | 40 | ||
42 | #include <target/target_core_base.h> | 41 | #include <target/target_core_base.h> |
43 | #include <target/target_core_device.h> | 42 | #include <target/target_core_device.h> |
@@ -3022,7 +3021,6 @@ static int target_core_init_configfs(void) | |||
3022 | struct config_group *target_cg, *hba_cg = NULL, *alua_cg = NULL; | 3021 | struct config_group *target_cg, *hba_cg = NULL, *alua_cg = NULL; |
3023 | struct config_group *lu_gp_cg = NULL; | 3022 | struct config_group *lu_gp_cg = NULL; |
3024 | struct configfs_subsystem *subsys; | 3023 | struct configfs_subsystem *subsys; |
3025 | struct proc_dir_entry *scsi_target_proc = NULL; | ||
3026 | struct t10_alua_lu_gp *lu_gp; | 3024 | struct t10_alua_lu_gp *lu_gp; |
3027 | int ret; | 3025 | int ret; |
3028 | 3026 | ||
@@ -3128,21 +3126,10 @@ static int target_core_init_configfs(void) | |||
3128 | if (core_dev_setup_virtual_lun0() < 0) | 3126 | if (core_dev_setup_virtual_lun0() < 0) |
3129 | goto out; | 3127 | goto out; |
3130 | 3128 | ||
3131 | scsi_target_proc = proc_mkdir("scsi_target", 0); | ||
3132 | if (!(scsi_target_proc)) { | ||
3133 | printk(KERN_ERR "proc_mkdir(scsi_target, 0) failed\n"); | ||
3134 | goto out; | ||
3135 | } | ||
3136 | ret = init_scsi_target_mib(); | ||
3137 | if (ret < 0) | ||
3138 | goto out; | ||
3139 | |||
3140 | return 0; | 3129 | return 0; |
3141 | 3130 | ||
3142 | out: | 3131 | out: |
3143 | configfs_unregister_subsystem(subsys); | 3132 | configfs_unregister_subsystem(subsys); |
3144 | if (scsi_target_proc) | ||
3145 | remove_proc_entry("scsi_target", 0); | ||
3146 | core_dev_release_virtual_lun0(); | 3133 | core_dev_release_virtual_lun0(); |
3147 | rd_module_exit(); | 3134 | rd_module_exit(); |
3148 | out_global: | 3135 | out_global: |
@@ -3210,8 +3197,6 @@ static void target_core_exit_configfs(void) | |||
3210 | printk(KERN_INFO "TARGET_CORE[0]: Released ConfigFS Fabric" | 3197 | printk(KERN_INFO "TARGET_CORE[0]: Released ConfigFS Fabric" |
3211 | " Infrastructure\n"); | 3198 | " Infrastructure\n"); |
3212 | 3199 | ||
3213 | remove_scsi_target_mib(); | ||
3214 | remove_proc_entry("scsi_target", 0); | ||
3215 | core_dev_release_virtual_lun0(); | 3200 | core_dev_release_virtual_lun0(); |
3216 | rd_module_exit(); | 3201 | rd_module_exit(); |
3217 | release_se_global(); | 3202 | release_se_global(); |