[Devel] [PATCH rh7 1/6] Drop vz_compat boot param

[Vladimir Davydov]

It was introduced by commit d7b23ae8a314f ("ve/cgroups: use cgroup
subsystem names only if in vz compat mode") in order to provide a way of
running pcs6 environment along with vz7 kernel. Turned out, this is not
needed, so drop the option altogether.

Signed-off-by: Vladimir Davydov <vdavydov at virtuozzo.com>
---
 include/linux/ve.h      |  4 ----
 kernel/bc/beancounter.c |  2 --
 kernel/fairsched.c      |  1 -
 kernel/ve/ve.c          | 10 ----------
 kernel/ve/vecalls.c     |  1 -
 5 files changed, 18 deletions(-)

diff --git a/include/linux/ve.h b/include/linux/ve.h
index 2d0c19ee2d98..a40e219c8bce 100644
--- a/include/linux/ve.h
+++ b/include/linux/ve.h
@@ -155,8 +155,6 @@ extern __u64 ve_setup_iptables_mask(__u64 init_mask);
 #ifdef CONFIG_VE
 #define ve_uevent_seqnum       (get_exec_env()->_uevent_seqnum)
 
-extern int vz_compat;
-
 extern struct kobj_ns_type_operations ve_ns_type_operations;
 extern struct kobject * kobject_create_and_add_ve(const char *name,
 						struct kobject *parent);
@@ -249,8 +247,6 @@ static inline void ve_mount_nr_dec(void)
 
 #define ve_uevent_seqnum uevent_seqnum
 
-#define vz_compat	(0)
-
 static inline int vz_security_family_check(struct net *net, int family) { return 0; }
 static inline int vz_security_protocol_check(struct net *net, int protocol) { return 0; }
 
diff --git a/kernel/bc/beancounter.c b/kernel/bc/beancounter.c
index b26d292e2881..935ca517e1f4 100644
--- a/kernel/bc/beancounter.c
+++ b/kernel/bc/beancounter.c
@@ -35,7 +35,6 @@
 #include <linux/random.h>
 #include <linux/cgroup.h>
 #include <linux/pid_namespace.h>
-#include <linux/ve.h>
 #include <linux/cgroup.h>
 #include <linux/task_work.h>
 
@@ -1181,7 +1180,6 @@ void __init ub_init_late(void)
 int __init ub_init_cgroup(void)
 {
 	struct cgroup_sb_opts blkio_opts = {
-		.name		= vz_compat ? "beancounter" : NULL,
 		.subsys_mask    = (1ul << blkio_subsys_id),
 	};
 	struct cgroup_sb_opts mem_opts = {
diff --git a/kernel/fairsched.c b/kernel/fairsched.c
index d3d17126a85c..8149076c8cb8 100644
--- a/kernel/fairsched.c
+++ b/kernel/fairsched.c
@@ -796,7 +796,6 @@ int __init fairsched_init(void)
 {
 	struct vfsmount *cpu_mnt, *cpuset_mnt;
 	struct cgroup_sb_opts cpu_opts = {
-		.name		= vz_compat ? "fairsched" : NULL,
 		.subsys_mask	=
 			(1ul << cpu_cgroup_subsys_id) |
 			(1ul << cpuacct_subsys_id),
diff --git a/kernel/ve/ve.c b/kernel/ve/ve.c
index 53fa12dca238..703f97c03cb2 100644
--- a/kernel/ve/ve.c
+++ b/kernel/ve/ve.c
@@ -89,18 +89,8 @@ DEFINE_MUTEX(ve_list_lock);
 int nr_ve = 1;	/* One VE always exists. Compatibility with vestat */
 EXPORT_SYMBOL(nr_ve);
 
-int vz_compat;
-EXPORT_SYMBOL(vz_compat);
-
 static DEFINE_IDR(ve_idr);
 
-static int __init vz_compat_setup(char *arg)
-{
-	get_option(&arg, &vz_compat);
-	return 0;
-}
-early_param("vz_compat", vz_compat_setup);
-
 struct ve_struct *get_ve(struct ve_struct *ve)
 {
 	if (ve)
diff --git a/kernel/ve/vecalls.c b/kernel/ve/vecalls.c
index 537fc4aa964b..a690a8faabba 100644
--- a/kernel/ve/vecalls.c
+++ b/kernel/ve/vecalls.c
@@ -309,7 +309,6 @@ static struct vfsmount *ve_cgroup_mnt, *devices_cgroup_mnt;
 static int __init init_vecalls_cgroups(void)
 {
 	struct cgroup_sb_opts devices_opts = {
-		.name		= vz_compat ? "container" : NULL,
 		.subsys_mask	=
 			(1ul << devices_subsys_id),
 	};
-- 
2.1.4