[Devel] [PATCH RHEL7 COMMIT] ub: hide dcachesize and oomguarpages in ub cgroup

[Konstantin Khorenko]

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.12
------>
commit 464d12b5ffb3f2c1cc8dba58b3b6a3ca8de43b24
Author: Vladimir Davydov <vdavydov at parallels.com>
Date:   Wed Jun 10 20:05:25 2015 +0400

    ub: hide dcachesize and oomguarpages in ub cgroup
    
    The knobs for dcachesize and oomguarpages are useless, just like for
    physpages, swappages, and kmemsize, because the underlying resources are
    managed by memcg.
    
    Signed-off-by: Vladimir Davydov <vdavydov at parallels.com>
---
 kernel/bc/beancounter.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kernel/bc/beancounter.c b/kernel/bc/beancounter.c
index adb30ed..f806012 100644
--- a/kernel/bc/beancounter.c
+++ b/kernel/bc/beancounter.c
@@ -776,9 +776,12 @@ static __init int ub_cgroup_init(void)
 		if (!strcmp(ub_rnames[i], "dummy"))
 			continue;
 
+		/* accounted by memcg */
 		if (i == UB_PHYSPAGES ||
 		    i == UB_SWAPPAGES ||
-		    i == UB_KMEMSIZE)
+		    i == UB_OOMGUARPAGES ||
+		    i == UB_KMEMSIZE ||
+		    i == UB_DCACHESIZE)
 			continue;
 
 		cft = &cgroup_files[j * UB_CGROUP_NR_ATTRS];