leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cgroup_freezer: unnecessary test in cgroup_freezing_or_frozen()

Browse Source 
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: Tomasz 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Tomasz Buchert 2010-10-27 15:33:32 -07:00 committed by Linus Torvalds
parent abffc0207f
commit d5de4ddb1b
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kernel/cgroup_freezer.c
View File

@ -48,20 +48,19 @@ static inline struct freezer *task_freezer(struct task_struct *task)
struct freezer, css); struct freezer, css);
} }
static inline int __cgroup_freezing_or_frozen(struct task_struct *task)
{
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 cgroup_freezing_or_frozen(struct task_struct *task)
{ {
struct freezer *freezer; int result;
enum freezer_state state;
task_lock(task); task_lock(task);
freezer = task_freezer(task); result = __cgroup_freezing_or_frozen(task);
if (!freezer->css.cgroup->parent)
state = CGROUP_THAWED; /* root cgroup can't be frozen */
else
state = freezer->state;
task_unlock(task); task_unlock(task);
return result;
return (state == CGROUP_FREEZING) || (state == CGROUP_FROZEN);
} }
/* /*