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

Commit d5de4ddb authored by Tomasz Buchert's avatar Tomasz Buchert Committed by Linus Torvalds
Browse files

cgroup_freezer: unnecessary test in cgroup_freezing_or_frozen() 



The root freezer_state is always CGROUP_THAWED so we can remove the
special case from the code.  The test itself can be handy and is extracted
to static function.

Signed-off-by: default avatarTomasz Buchert <tomasz.buchert@inria.fr>
Cc: Matt Helsley <matthltc@us.ibm.com>
Cc: Paul Menage <menage@google.com>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent abffc020

kernel/cgroup_freezer.c

+9 −10
Original line number Diff line number Diff line
@@ -48,20 +48,19 @@ static inline struct freezer *task_freezer(struct task_struct *task) 
			    struct freezer, css);

}



int cgroup_freezing_or_frozen(struct task_struct *task)

static inline int __cgroup_freezing_or_frozen(struct task_struct *task)

{

	struct freezer *freezer;

	enum freezer_state state;

	enum freezer_state state = task_freezer(task)->state;

	return (state == CGROUP_FREEZING) || (state == CGROUP_FROZEN);

}



int cgroup_freezing_or_frozen(struct task_struct *task)

{

	int result;

	task_lock(task);

	freezer = task_freezer(task);

	if (!freezer->css.cgroup->parent)

		state = CGROUP_THAWED; /* root cgroup can't be frozen */

	else

		state = freezer->state;

	result = __cgroup_freezing_or_frozen(task);

	task_unlock(task);



	return (state == CGROUP_FREEZING) || (state == CGROUP_FROZEN);

	return result;

}



/*