[Devel] [PATCH v8 3/9] cgroup: Declared cgroup_mark_ve_root in public header
Valeriy Vdovin
valeriy.vdovin at virtuozzo.com
Thu Apr 16 13:06:27 MSK 2020
Signed-off-by: Valeriy Vdovin <valeriy.vdovin at virtuozzo.com>
---
include/linux/cgroup.h | 4 ++++
kernel/cgroup.c | 2 +-
kernel/ve/ve.c | 4 +---
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index d671309..0239518 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -614,6 +614,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 d977ecc..b3d3c51 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -4237,7 +4237,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 ba547e1..94723e6 100644
--- a/kernel/ve/ve.c
+++ b/kernel/ve/ve.c
@@ -479,8 +479,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",
@@ -543,7 +541,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);
err = ve_workqueue_start(ve);
if (err)
--
1.8.3.1
More information about the Devel
mailing list