From 70077b25f634a8ccbb82dd01b707445332c192a4 Mon Sep 17 00:00:00 2001 From: Tomasz Buchert Date: Wed, 27 Oct 2010 15:33:32 -0700 Subject: [PATCH] --- yaml --- r: 218523 b: refs/heads/master c: d5de4ddb1bc430289bede76c0d87cabee93f749a h: refs/heads/master i: 218521: be56a53eba1f76631adaccfecfbcc2aff0bc6aec 218519: 1ae6539bff7c9e5facff1d4463b4ec5c7d6b2ac7 v: v3 --- [refs] | 2 +- trunk/kernel/cgroup_freezer.c | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index e05d29a3bdea..b043918d9f94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abffc0207f12563f17bbde96e4cc0d9f3d7e2a53 +refs/heads/master: d5de4ddb1bc430289bede76c0d87cabee93f749a diff --git a/trunk/kernel/cgroup_freezer.c b/trunk/kernel/cgroup_freezer.c index ce71ed53e88f..321e2a007d25 100644 --- a/trunk/kernel/cgroup_freezer.c +++ b/trunk/kernel/cgroup_freezer.c @@ -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; } /*