From c86c22b5e5267e6e3c8079564ac9888ac4da3c82 Mon Sep 17 00:00:00 2001 From: Li Zefan Date: Wed, 12 Nov 2008 13:26:49 -0800 Subject: [PATCH] --- yaml --- r: 118905 b: refs/heads/master c: 687446760bd008df96655cb8c5900f8e48a7118c h: refs/heads/master i: 118903: 404bb1ec2c9f1a231b1cb8fdcbdfb95096080a01 v: v3 --- [refs] | 2 +- trunk/kernel/cgroup_freezer.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 498de2b6479f..ae39e9489f08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0bcb6069a6e1af5c114a2a8873ec43ada8933596 +refs/heads/master: 687446760bd008df96655cb8c5900f8e48a7118c diff --git a/trunk/kernel/cgroup_freezer.c b/trunk/kernel/cgroup_freezer.c index 7fa476f01d05..660590710409 100644 --- a/trunk/kernel/cgroup_freezer.c +++ b/trunk/kernel/cgroup_freezer.c @@ -184,9 +184,13 @@ static void freezer_fork(struct cgroup_subsys *ss, struct task_struct *task) { struct freezer *freezer; - task_lock(task); + /* + * No lock is needed, since the task isn't on tasklist yet, + * so it can't be moved to another cgroup, which means the + * freezer won't be removed and will be valid during this + * function call. + */ freezer = task_freezer(task); - task_unlock(task); spin_lock_irq(&freezer->lock); BUG_ON(freezer->state == CGROUP_FROZEN);