[Devel] [PATCH RHEL7 COMMIT] ve/mm: enable oom grouping rules on OOM

[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.11
------>
commit 7fbf0d81b853d09c9b3aecce4b0812adbd71188d
Author: Vladimir Davydov <vdavydov at parallels.com>
Date:   Mon Jun 8 20:10:36 2015 +0400

    ve/mm: enable oom grouping rules on OOM
    
    Series description:
    
    This patch /proc/PID/{oom_score_adj,oom_adj,oom_score} behavior inside a
    CT, resurrecting /proc/vz/oom_score_adj along the way. For more details,
    see individual patches.
    
    https://jira.sw.ru/browse/PSBM-33849
    ====================================================================
    This patch description:
    
    It has already been ported from RH6 and we only need to make oom_badness
    use it.
    
    Signed-off-by: Vladimir Davydov <vdavydov at parallels.com>
    Acked-by: Andrew Vagin <avagin at odin.com>
---
 mm/oom_kill.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 7971030..c99a5f5 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -164,7 +164,7 @@ unsigned long oom_badness(struct task_struct *p, struct mem_cgroup *memcg,
 	if (!p)
 		return 0;
 
-	adj = (long)p->signal->oom_score_adj;
+	adj = get_task_oom_score_adj(p);
 #ifdef CONFIG_VE
 	/* Ignore oom_score_adj of containerized tasks on system-wide OOM */
 	if (global && p->task_ve != &ve0)