Skip to content

Commit

Permalink
cgroup_freezer: unnecessary test in cgroup_freezing_or_frozen()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tomasz Buchert authored and Linus Torvalds committed Oct 28, 2010
1 parent abffc02 commit d5de4dd
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions kernel/cgroup_freezer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/*
Expand Down

0 comments on commit d5de4dd

Please sign in to comment.