diff options
author | Tao Ma <boyu.mt@taobao.com> | 2012-11-20 09:06:18 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2012-11-20 09:44:58 -0500 |
commit | d0b2fdd2a51203f04ea0a5d716e033c15e0231af (patch) | |
tree | 778d37a6aa21db18b7416309a5cbd1d664e9c6e0 /kernel | |
parent | 0a950f65e1e64f4e82b4b5507773848ea88bcb8e (diff) |
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>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/cgroup.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 6db01417d39a..55a0a770a5a2 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
@@ -782,12 +782,12 @@ static struct cgroup *task_cgroup_from_root(struct task_struct *task, | |||
782 | * The task_lock() exception | 782 | * The task_lock() exception |
783 | * | 783 | * |
784 | * The need for this exception arises from the action of | 784 | * The need for this exception arises from the action of |
785 | * cgroup_attach_task(), which overwrites one tasks cgroup pointer with | 785 | * cgroup_attach_task(), which overwrites one task's cgroup pointer with |
786 | * another. It does so using cgroup_mutex, however there are | 786 | * another. It does so using cgroup_mutex, however there are |
787 | * several performance critical places that need to reference | 787 | * several performance critical places that need to reference |
788 | * task->cgroup without the expense of grabbing a system global | 788 | * task->cgroup without the expense of grabbing a system global |
789 | * mutex. Therefore except as noted below, when dereferencing or, as | 789 | * mutex. Therefore except as noted below, when dereferencing or, as |
790 | * in cgroup_attach_task(), modifying a task'ss cgroup pointer we use | 790 | * in cgroup_attach_task(), modifying a task's cgroup pointer we use |
791 | * task_lock(), which acts on a spinlock (task->alloc_lock) already in | 791 | * task_lock(), which acts on a spinlock (task->alloc_lock) already in |
792 | * the task_struct routinely used for such matters. | 792 | * the task_struct routinely used for such matters. |
793 | * | 793 | * |
@@ -1882,9 +1882,7 @@ EXPORT_SYMBOL_GPL(cgroup_taskset_size); | |||
1882 | /* | 1882 | /* |
1883 | * cgroup_task_migrate - move a task from one cgroup to another. | 1883 | * cgroup_task_migrate - move a task from one cgroup to another. |
1884 | * | 1884 | * |
1885 | * 'guarantee' is set if the caller promises that a new css_set for the task | 1885 | * Must be called with cgroup_mutex and threadgroup locked. |
1886 | * will already exist. If not set, this function might sleep, and can fail with | ||
1887 | * -ENOMEM. Must be called with cgroup_mutex and threadgroup locked. | ||
1888 | */ | 1886 | */ |
1889 | static void cgroup_task_migrate(struct cgroup *cgrp, struct cgroup *oldcgrp, | 1887 | static void cgroup_task_migrate(struct cgroup *cgrp, struct cgroup *oldcgrp, |
1890 | struct task_struct *tsk, struct css_set *newcg) | 1888 | struct task_struct *tsk, struct css_set *newcg) |