Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c01f46c7 authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

mm: memcontrol: remove bogus NULL check after mem_cgroup_from_task() 



That function acts like a typecast - unless NULL is passed in, no NULL can
come out.  task_in_mem_cgroup() callers don't pass NULL tasks.

Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Reviewed-by: default avatarVladimir Davydov <vdavydov@parallels.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 312722cb

mm/memcontrol.c

+2 −3
Original line number Diff line number Diff line
@@ -1356,7 +1356,7 @@ static bool mem_cgroup_same_or_subtree(const struct mem_cgroup *root_memcg, 
bool task_in_mem_cgroup(struct task_struct *task,

			const struct mem_cgroup *memcg)

{

	struct mem_cgroup *curr = NULL;

	struct mem_cgroup *curr;

	struct task_struct *p;

	bool ret;
@@ -1372,7 +1372,6 @@ bool task_in_mem_cgroup(struct task_struct *task, 
		 */

		rcu_read_lock();

		curr = mem_cgroup_from_task(task);

		if (curr)

		css_get(&curr->css);

		rcu_read_unlock();

	}