The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git after rh7-3.10.0-123.1.2.vz7.5.7 ------> commit 9eafb07898336d06d2003d45e8c682837be2ae2e Author: Vladimir Davydov <vdavy...@parallels.com> Date: Fri May 29 11:55:35 2015 +0400
ms/memcg: rename memory.low_limit_in_bytes to memory.low This is how it called upstream (in the unified hierarchy). Another reason for rename is that memory.low is not actually a limit - it is a low wss estimate. Since memory.low was added not long before and it is only used by vcmmd and we are haven't released Beta yet, such a rename seems to be acceptable. In order not to break anything I'll make vcmmd work fine on both kernels with memory.low and ones with memory.low_limit_in_bytes. Signed-off-by: Vladimir Davydov <vdavy...@parallels.com> Reviewed-by: Kirill Tkhai <ktk...@odin.com> --- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index cfe5875..63a800c 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -6086,7 +6086,7 @@ static struct cftype mem_cgroup_files[] = { .read = mem_cgroup_read, }, { - .name = "low_limit_in_bytes", + .name = "low", .write_string = mem_cgroup_low_write, .read = mem_cgroup_low_read, }, _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel