The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git after rh7-3.10.0-123.1.2.vz7.5.12 ------> commit 6766c0363252159f488f72e5b7ea3500fa106fb0 Author: Vladimir Davydov <vdavy...@parallels.com> Date: Wed Jun 10 18:15:53 2015 +0400
ub: drop /proc/bc/BCID/debug Nothing useful is left there, so zap it. Also zap the corresponding config option. Signed-off-by: Vladimir Davydov <vdavy...@parallels.com> --- config.OpenVZ | 1 - kernel/bc/Kconfig | 7 ------- kernel/bc/proc.c | 25 ------------------------- 3 files changed, 33 deletions(-) diff --git a/config.OpenVZ b/config.OpenVZ index a174083..302c6a2 100644 --- a/config.OpenVZ +++ b/config.OpenVZ @@ -5303,5 +5303,4 @@ CONFIG_BEANCOUNTERS=y CONFIG_BC_IO_ACCOUNTING=y CONFIG_BC_IO_PRIORITY=y CONFIG_BC_PROC=y -CONFIG_BC_DEBUG=y # CONFIG_BC_DEBUG_ITEMS is not set diff --git a/kernel/bc/Kconfig b/kernel/bc/Kconfig index cabebdd..fd1e9d6 100644 --- a/kernel/bc/Kconfig +++ b/kernel/bc/Kconfig @@ -53,13 +53,6 @@ config BC_PROC help Allows a system administrator to inspect resource accounts and limits. -config BC_DEBUG - bool "User resources debug features" - default y - depends on BEANCOUNTERS - help - Enables to setup debug features for user resource accounting - config BC_DEBUG_ITEMS bool "Account resources in items rather than in bytes" default n diff --git a/kernel/bc/proc.c b/kernel/bc/proc.c index e0ddbf1..21672d9 100644 --- a/kernel/bc/proc.c +++ b/kernel/bc/proc.c @@ -90,28 +90,6 @@ static struct bc_proc_entry bc_resources_entry = { .u.show = bc_resources_show, }; -#ifdef CONFIG_BC_DEBUG -static int bc_debug_show(struct seq_file *f, void *v) -{ - struct user_beancounter *ub; - - ub = seq_beancounter(f); - seq_printf(f, "uid: %s\n", ub->ub_name); - seq_printf(f, "ref: %d\n", css_refcnt(&ub->css)); - seq_printf(f, "flags: 0x%lx\n", ub->ub_flags); - - seq_printf(f, "bc: %p\n", ub); - seq_printf(f, "sizeof: %lu\n", sizeof(struct user_beancounter)); - - return 0; -} - -static struct bc_proc_entry bc_debug_entry = { - .name = "debug", - .u.show = bc_debug_show, -}; -#endif - static int bc_precharge_show(struct seq_file *f, void *v) { struct user_beancounter *ub; @@ -762,9 +740,6 @@ static int __init ub_init_proc(void) bc_proc_root->proc_iops = &bc_root_iops; bc_register_proc_entry(&bc_resources_entry); -#ifdef CONFIG_BC_DEBUG - bc_register_proc_entry(&bc_debug_entry); -#endif bc_register_proc_entry(&bc_precharge_entry); bc_register_proc_root_entry(&bc_all_resources_entry); bc_register_proc_entry(&bc_meminfo_entry); _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel