Commit a6587ef4 authored by Tycho Andersen's avatar Tycho Andersen Committed by Pavel Emelyanov

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: 's avatarTycho Andersen <tycho.andersen@canonical.com>
CC: Cyrill Gorcunov <gorcunov@openvz.org>
Acked-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent e30f45d3
...@@ -409,8 +409,7 @@ static int cgp_parse_builtins(void) ...@@ -409,8 +409,7 @@ static int cgp_parse_builtins(void)
"\"cpu.cfs_period_us\", " "\"cpu.cfs_period_us\", "
"\"cpu.cfs_quota_us\", " "\"cpu.cfs_quota_us\", "
"\"cpu.rt_period_us\", " "\"cpu.rt_period_us\", "
"\"cpu.rt_runtime_us\", " "\"cpu.rt_runtime_us\" "
"\"notify_on_release\" "
"]\n" "]\n"
/* limit_in_bytes and memsw.limit_in_bytes must be set in this order */ /* limit_in_bytes and memsw.limit_in_bytes must be set in this order */
"\"memory\":\n" "\"memory\":\n"
...@@ -419,8 +418,7 @@ static int cgp_parse_builtins(void) ...@@ -419,8 +418,7 @@ static int cgp_parse_builtins(void)
"[ " "[ "
"\"memory.limit_in_bytes\", " "\"memory.limit_in_bytes\", "
"\"memory.memsw.limit_in_bytes\", " "\"memory.memsw.limit_in_bytes\", "
"\"memory.use_hierarchy\", " "\"memory.use_hierarchy\" "
"\"notify_on_release\" "
"]\n" "]\n"
/* /*
* cpuset.cpus and cpuset.mems must be set before the process moves * cpuset.cpus and cpuset.mems must be set before the process moves
...@@ -441,21 +439,18 @@ static int cgp_parse_builtins(void) ...@@ -441,21 +439,18 @@ static int cgp_parse_builtins(void)
"\"cpuset.memory_spread_page\", " "\"cpuset.memory_spread_page\", "
"\"cpuset.memory_spread_slab\", " "\"cpuset.memory_spread_slab\", "
"\"cpuset.sched_load_balance\", " "\"cpuset.sched_load_balance\", "
"\"cpuset.sched_relax_domain_level\", " "\"cpuset.sched_relax_domain_level\" "
"\"notify_on_release\" "
"]\n" "]\n"
"\"blkio\":\n" "\"blkio\":\n"
" - \"strategy\": \"replace\"\n" " - \"strategy\": \"replace\"\n"
" - \"properties\": " " - \"properties\": "
"[ " "[ "
"\"blkio.weight\", " "\"blkio.weight\" "
"\"notify_on_release\" "
"]\n" "]\n"
"\"freezer\":\n" "\"freezer\":\n"
" - \"strategy\": \"replace\"\n" " - \"strategy\": \"replace\"\n"
" - \"properties\": " " - \"properties\": "
"[ " "[ "
"\"notify_on_release\" "
"]\n"; "]\n";
return cgp_parse_stream((void *)predefined_stream, return cgp_parse_stream((void *)predefined_stream,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment