]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
mm: kmem: remove redundant checks from get_obj_cgroup_from_current()
authorRoman Gushchin <guro@fb.com>
Sat, 17 Oct 2020 23:13:47 +0000 (16:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 18 Oct 2020 16:27:09 +0000 (09:27 -0700)
There are checks for current->mm and current->active_memcg in
get_obj_cgroup_from_current(), but these checks are redundant:
memcg_kmem_bypass() called just above performs same checks.

Signed-off-by: Roman Gushchin <guro@fb.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Shakeel Butt <shakeelb@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Link: http://lkml.kernel.org/r/20200827225843.1270629-3-guro@fb.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/memcontrol.c

index 197b9ddb20f3dcd6f36d4d2d2309cd427e857b9a..51b1698bf06c79a030d9966030b0bb7bfbb40ed3 100644 (file)
@@ -2939,9 +2939,6 @@ __always_inline struct obj_cgroup *get_obj_cgroup_from_current(void)
        if (memcg_kmem_bypass())
                return NULL;
 
-       if (unlikely(!current->mm && !current->active_memcg))
-               return NULL;
-
        rcu_read_lock();
        if (unlikely(current->active_memcg))
                memcg = rcu_dereference(current->active_memcg);