diff options
| author |   Johannes Weiner <hannes@cmpxchg.org> | 2014-12-10 15:44:30 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-10 17:41:08 -0800 |
| commit | 413918bb61b4fa027baa3e79546c47f15e4b9ea8 (patch) | |
| tree | 439c803ef6cdb6fde9a8dbef510506f519a50338 /mm/memcontrol.c | |
| parent | mm: memcontrol: remove bogus NULL check after mem_cgroup_from_task() (diff) | |
| download | linux-dev-413918bb61b4fa027baa3e79546c47f15e4b9ea8.tar.xz linux-dev-413918bb61b4fa027baa3e79546c47f15e4b9ea8.zip | |
mm: memcontrol: pull the NULL check from __mem_cgroup_same_or_subtree()
The NULL in mm_match_cgroup() comes from a possibly exiting mm->owner. It
makes a lot more sense to check where it's looked up, rather than check
for it in __mem_cgroup_same_or_subtree() where it's unexpected.
No other callsite passes NULL to __mem_cgroup_same_or_subtree().
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Vladimir Davydov <vdavydov@parallels.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/memcontrol.c')
| -rw-r--r-- | mm/memcontrol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 367cc57df362..e5dcebd71dfb 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1337,7 +1337,7 @@ bool __mem_cgroup_same_or_subtree(const struct mem_cgroup *root_memcg, { if (root_memcg == memcg) return true; - if (!root_memcg->use_hierarchy || !memcg) + if (!root_memcg->use_hierarchy) return false; return cgroup_is_descendant(memcg->css.cgroup, root_memcg->css.cgroup); } |