[RHEL7,v21,03/14] cgroup: declared cgroup_mark_ve_root in public header

Submitted by Valeriy Vdovin on July 28, 2020, 5:53 p.m.

Details

Message ID 1595958806-338946-4-git-send-email-valeriy.vdovin@virtuozzo.com
State New
Series "Make release_agent per-cgroup property. Run release_agent in proper ve."
Headers show

Commit Message

Valeriy Vdovin July 28, 2020, 5:53 p.m. 
Signed-off-by: Valeriy Vdovin <valeriy.vdovin@virtuozzo.com>
Reviewed-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
 include/linux/cgroup.h | 4 ++++
 kernel/cgroup.c        | 2 +-
 kernel/ve/ve.c         | 4 +---
 3 files changed, 6 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox 

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index ce46ee8..b25d0e18 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -649,6 +649,10 @@  int cgroup_path_ve(const struct cgroup *cgrp, char *buf, int buflen);
 
 int cgroup_task_count(const struct cgroup *cgrp);
 
+#ifdef CONFIG_VE
+void cgroup_mark_ve_roots(struct ve_struct *ve);
+#endif
+
 /*
  * Control Group taskset, used to pass around set of tasks to cgroup_subsys
  * methods.
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index e703927..a91dd5f 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -4331,7 +4331,7 @@  static int subgroups_count(struct cgroup *cgroup)
 }
 
 #ifdef CONFIG_VE
-void cgroup_mark_ve_root(struct ve_struct *ve)
+void cgroup_mark_ve_roots(struct ve_struct *ve)
 {
 	struct cgroup *cgrp;
 	struct cgroupfs_root *root;
diff --git a/kernel/ve/ve.c b/kernel/ve/ve.c
index 236304a..32c9598 100644
--- a/kernel/ve/ve.c
+++ b/kernel/ve/ve.c
@@ -484,8 +484,6 @@  static void ve_drop_context(struct ve_struct *ve)
 
 static const struct timespec zero_time = { };
 
-extern void cgroup_mark_ve_root(struct ve_struct *ve);
-
 static int ve_workqueue_start(struct ve_struct *ve)
 {
 	ve->wq = alloc_workqueue("ve_wq_%s",
@@ -552,7 +550,7 @@  static int ve_start_container(struct ve_struct *ve)
 	if (err < 0)
 		goto err_iterate;
 
-	cgroup_mark_ve_root(ve);
+	cgroup_mark_ve_roots(ve);
 
 	ve->is_running = 1;