From a6587ef404a2e55b58e2ecaef6037eaca4bbb0fd Mon Sep 17 00:00:00 2001 From: Tycho Andersen Date: Mon, 6 Jun 2016 15:20:14 +0000 Subject: [PATCH] cgroup props: ditch notify_on_release from individual controllers This is listed as a global prop, so we don't need to list it individually. Signed-off-by: Tycho Andersen CC: Cyrill Gorcunov Acked-by: Cyrill Gorcunov Signed-off-by: Pavel Emelyanov --- criu/cgroup-props.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/criu/cgroup-props.c b/criu/cgroup-props.c index bbb8d7847..26d0ec1d9 100644 --- a/criu/cgroup-props.c +++ b/criu/cgroup-props.c @@ -409,8 +409,7 @@ static int cgp_parse_builtins(void) "\"cpu.cfs_period_us\", " "\"cpu.cfs_quota_us\", " "\"cpu.rt_period_us\", " - "\"cpu.rt_runtime_us\", " - "\"notify_on_release\" " + "\"cpu.rt_runtime_us\" " "]\n" /* limit_in_bytes and memsw.limit_in_bytes must be set in this order */ "\"memory\":\n" @@ -419,8 +418,7 @@ static int cgp_parse_builtins(void) "[ " "\"memory.limit_in_bytes\", " "\"memory.memsw.limit_in_bytes\", " - "\"memory.use_hierarchy\", " - "\"notify_on_release\" " + "\"memory.use_hierarchy\" " "]\n" /* * cpuset.cpus and cpuset.mems must be set before the process moves @@ -441,21 +439,18 @@ static int cgp_parse_builtins(void) "\"cpuset.memory_spread_page\", " "\"cpuset.memory_spread_slab\", " "\"cpuset.sched_load_balance\", " - "\"cpuset.sched_relax_domain_level\", " - "\"notify_on_release\" " + "\"cpuset.sched_relax_domain_level\" " "]\n" "\"blkio\":\n" " - \"strategy\": \"replace\"\n" " - \"properties\": " "[ " - "\"blkio.weight\", " - "\"notify_on_release\" " + "\"blkio.weight\" " "]\n" "\"freezer\":\n" " - \"strategy\": \"replace\"\n" " - \"properties\": " "[ " - "\"notify_on_release\" " "]\n"; return cgp_parse_stream((void *)predefined_stream,