]> git.baikalelectronics.ru Git - kernel.git/commitdiff
mm/oom_kill: remove unneeded is_memcg_oom check
authorMiaohe Lin <linmiaohe@huawei.com>
Tue, 22 Mar 2022 21:46:02 +0000 (14:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Mar 2022 22:57:09 +0000 (15:57 -0700)
oom_cpuset_eligible() is always called when !is_memcg_oom().  Remove this
unnecessary check.

Link: https://lkml.kernel.org/r/20220224115933.20154-1-linmiaohe@huawei.com
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/oom_kill.c

index 832fb330376efe9f509045516a72d795af5e39a8..4db425eedbe8b179ff740f8a70a764ac867783aa 100644 (file)
@@ -93,9 +93,6 @@ static bool oom_cpuset_eligible(struct task_struct *start,
        bool ret = false;
        const nodemask_t *mask = oc->nodemask;
 
-       if (is_memcg_oom(oc))
-               return true;
-
        rcu_read_lock();
        for_each_thread(start, tsk) {
                if (mask) {