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.23
------>
commit 8a10f9172fb3b939a63c8cf35ed30349da72aada
Author: Vladimir Davydov <vdavy...@parallels.com>
Date: Tue Jun 30 18:22:01 2015 +0400
ve: zap ve_glob_meminfo
It is not used anywhere. Anyway, if one wants to show global meminfo
inside a ve, he can bind the ve beancounter to the root memory cgroup by
echoing '/' to /sys/fs/cgroup/beancounter/$VEID/beancounter.memory, so
this knob does not worth resurrecting.
Signed-off-by: Vladimir Davydov <vdavy...@parallels.com>
---
include/linux/ve.h | 1 -
kernel/sysctl.c | 7 -------
kernel/ve/ve.c | 1 -
3 files changed, 9 deletions(-)
diff --git a/include/linux/ve.h b/include/linux/ve.h
index 9bbf352..6adeffa 100644
--- a/include/linux/ve.h
+++ b/include/linux/ve.h
@@ -167,7 +167,6 @@ extern const void *ve_namespace(struct device *dev);
extern struct kmapset_set ve_sysfs_perms;
-extern int glob_ve_meminfo;
extern int ve_allow_kthreads;
extern int vz_security_family_check(struct net *net, int family);
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 2380136..db6c4e6 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -827,13 +827,6 @@ static struct ctl_table kern_table[] = {
#endif
#ifdef CONFIG_VE
{
- .procname = "ve_meminfo",
- .data = &glob_ve_meminfo,
- .maxlen = sizeof(int),
- .mode = 0644,
- .proc_handler = &proc_dointvec,
- },
- {
.procname = "ve_allow_kthreads",
.data = &ve_allow_kthreads,
.maxlen = sizeof(int),
diff --git a/kernel/ve/ve.c b/kernel/ve/ve.c
index 8bbba1f..07c0652 100644
--- a/kernel/ve/ve.c
+++ b/kernel/ve/ve.c
@@ -56,7 +56,6 @@ struct module no_module = { .state = MODULE_STATE_GOING };
EXPORT_SYMBOL(no_module);
#endif
-int glob_ve_meminfo = 0;
int ve_allow_kthreads = 1;
struct kmapset_set ve_sysfs_perms;
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
