[Devel] [PATCH RHEL7 COMMIT] Drop vz_compat boot param

[Vladimir Davydov]

The commit is pushed to "branch-rh7-3.10.0-327.18.2.vz7.14.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-327.18.2.vz7.14.16
------>
commit f8b72e7837625c7de569fefcf3bba05ac2ef6b5e
Author: Vladimir Davydov <vdavydov at virtuozzo.com>
Date:   Mon Jun 20 21:01:36 2016 +0400

    Drop vz_compat boot param
    
    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 813f16d5e825..182a63899a0b 100644
--- a/include/linux/ve.h
+++ b/include/linux/ve.h
@@ -153,8 +153,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);
@@ -247,8 +245,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 f8a397269152..d35ddb3499d4 100644
--- a/kernel/bc/beancounter.c
+++ b/kernel/bc/beancounter.c
@@ -33,7 +33,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>
 
@@ -1179,7 +1178,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 959c19f4d7fc..e015cff87a97 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 22df66e1b257..d811d4818fa6 100644
--- a/kernel/ve/ve.c
+++ b/kernel/ve/ve.c
@@ -87,18 +87,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 5aa9722d692d..2b8b27998f07 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),
 	};