[Devel,RHEL7,COMMIT] Remove container and beancounter directories from /proc/vz

Submitted by Konstantin Khorenko on Aug. 11, 2016, 9:44 a.m.

Details

Message ID 201608110944.u7B9io7R003125@finist_cl7.x64_64.work.ct
State New
Series "Remove container and beancounter directories from /proc/vz"
Headers show

Commit Message

Konstantin Khorenko Aug. 11, 2016, 9:44 a.m.
The commit is pushed to "branch-rh7-3.10.0-327.22.2.vz7.16.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-327.22.2.vz7.16.5
------>
commit 6b5f6028466d76fc0c28ae1a1ce0c6ded6176cd3
Author: Vladimir Davydov <vdavydov@virtuozzo.com>
Date:   Thu Aug 11 13:44:50 2016 +0400

    Remove container and beancounter directories from /proc/vz
    
    In PCS6, cgroups were mounted there. Now they are unused, as all cgroups
    are supposed to be mounted by systemd under /sys/fs/cgroup.
    
    Signed-off-by: Vladimir Davydov <vdavydov@virtuozzo.com>
---
 kernel/bc/proc.c    | 1 -
 kernel/ve/veowner.c | 1 -
 2 files changed, 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/kernel/bc/proc.c b/kernel/bc/proc.c
index 3a3b4e3..9f60d99 100644
--- a/kernel/bc/proc.c
+++ b/kernel/bc/proc.c
@@ -754,7 +754,6 @@  static int __init ub_init_proc(void)
 	entry = proc_create("user_beancounters",
 			S_IRUSR|S_ISVTX, NULL, &ub_file_operations);
 	proc_create("vswap", S_IRUSR, proc_vz_dir, &ub_vswap_fops);
-	proc_mkdir_mode("beancounter", 0, proc_vz_dir);
 	return 0;
 }
 
diff --git a/kernel/ve/veowner.c b/kernel/ve/veowner.c
index 757dde9..8df6390 100644
--- a/kernel/ve/veowner.c
+++ b/kernel/ve/veowner.c
@@ -63,7 +63,6 @@  static void prepare_proc(void)
 	 * sooner or later, but leave the stubs for now as they may be required
 	 * by userspace */
 
-	proc_mkdir_mode("container", 0, proc_vz_dir);
 	proc_mkdir_mode("fairsched", 0, proc_vz_dir);
 
 	proc_create("fairsched", S_ISVTX, NULL,	&proc_fairsched_operations);