dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

cgroup: remove obsolete guarantee from cgroup_task_migrate. 

'guarantee' is already removed from cgroup_task_migrate, so remove
the corresponding comments. Some other typos in cgroup are also
changed.

Cc: Tejun Heo <tj@kernel.org>
Cc: Li Zefan <lizefan@huawei.com>
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Tao Ma 2012-11-20 22:06:18 +08:00 committed by Tejun Heo
parent 0a950f65e1
commit d0b2fdd2a5
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/cgroup.h
View File

@ -66,7 +66,7 @@ struct cgroup_subsys_state {
/* /*
* State maintained by the cgroup system to allow subsystems * State maintained by the cgroup system to allow subsystems
* to be "busy". Should be accessed via css_get(), * to be "busy". Should be accessed via css_get(),
* css_tryget() and and css_put(). * css_tryget() and css_put().
*/ */
atomic_t refcnt; atomic_t refcnt;
@ -276,7 +276,7 @@ struct cgroup_map_cb {
/* cftype->flags */ /* cftype->flags */
#define CFTYPE_ONLY_ON_ROOT (1U << 0) /* only create on root cg */ #define CFTYPE_ONLY_ON_ROOT (1U << 0) /* only create on root cg */
#define CFTYPE_NOT_ON_ROOT (1U << 1) /* don't create onp root cg */ #define CFTYPE_NOT_ON_ROOT (1U << 1) /* don't create on root cg */
#define MAX_CFTYPE_NAME 64 #define MAX_CFTYPE_NAME 64

8
kernel/cgroup.c
View File

@ -782,12 +782,12 @@ static struct cgroup *task_cgroup_from_root(struct task_struct *task,
* The task_lock() exception * The task_lock() exception
* *
* The need for this exception arises from the action of * The need for this exception arises from the action of
* cgroup_attach_task(), which overwrites one tasks cgroup pointer with * cgroup_attach_task(), which overwrites one task's cgroup pointer with
* another. It does so using cgroup_mutex, however there are * another. It does so using cgroup_mutex, however there are
* several performance critical places that need to reference * several performance critical places that need to reference
* task->cgroup without the expense of grabbing a system global * task->cgroup without the expense of grabbing a system global
* mutex. Therefore except as noted below, when dereferencing or, as * mutex. Therefore except as noted below, when dereferencing or, as
* in cgroup_attach_task(), modifying a task'ss cgroup pointer we use * in cgroup_attach_task(), modifying a task's cgroup pointer we use
* task_lock(), which acts on a spinlock (task->alloc_lock) already in * task_lock(), which acts on a spinlock (task->alloc_lock) already in
* the task_struct routinely used for such matters. * the task_struct routinely used for such matters.
* *
@ -1882,9 +1882,7 @@ EXPORT_SYMBOL_GPL(cgroup_taskset_size);
/* /*
* cgroup_task_migrate - move a task from one cgroup to another. * cgroup_task_migrate - move a task from one cgroup to another.
* *
* 'guarantee' is set if the caller promises that a new css_set for the task * Must be called with cgroup_mutex and threadgroup locked.
* will already exist. If not set, this function might sleep, and can fail with
* -ENOMEM. Must be called with cgroup_mutex and threadgroup locked.
*/ */
static void cgroup_task_migrate(struct cgroup *cgrp, struct cgroup *oldcgrp, static void cgroup_task_migrate(struct cgroup *cgrp, struct cgroup *oldcgrp,
struct task_struct *tsk, struct css_set *newcg) struct task_struct *tsk, struct css_set *newcg)