提交 7f81b1ae 编写于 作者: L Li Zefan 提交者: Linus Torvalds

cpuset: remove struct cpuset_hotplug_scanner

Use cgroup_scanner.data, instead of introducing cpuset_hotplug_scanner.
Signed-off-by: NLi Zefan <lizf@cn.fujitsu.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Paul Menage <menage@google.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 010cfac4
...@@ -128,10 +128,6 @@ static inline struct cpuset *task_cs(struct task_struct *task) ...@@ -128,10 +128,6 @@ static inline struct cpuset *task_cs(struct task_struct *task)
return container_of(task_subsys_state(task, cpuset_subsys_id), return container_of(task_subsys_state(task, cpuset_subsys_id),
struct cpuset, css); struct cpuset, css);
} }
struct cpuset_hotplug_scanner {
struct cgroup_scanner scan;
struct cgroup *to;
};
/* bits in struct cpuset flags field */ /* bits in struct cpuset flags field */
typedef enum { typedef enum {
...@@ -1890,10 +1886,9 @@ int __init cpuset_init(void) ...@@ -1890,10 +1886,9 @@ int __init cpuset_init(void)
static void cpuset_do_move_task(struct task_struct *tsk, static void cpuset_do_move_task(struct task_struct *tsk,
struct cgroup_scanner *scan) struct cgroup_scanner *scan)
{ {
struct cpuset_hotplug_scanner *chsp; struct cgroup *new_cgroup = scan->data;
chsp = container_of(scan, struct cpuset_hotplug_scanner, scan); cgroup_attach_task(new_cgroup, tsk);
cgroup_attach_task(chsp->to, tsk);
} }
/** /**
...@@ -1909,15 +1904,15 @@ static void cpuset_do_move_task(struct task_struct *tsk, ...@@ -1909,15 +1904,15 @@ static void cpuset_do_move_task(struct task_struct *tsk,
*/ */
static void move_member_tasks_to_cpuset(struct cpuset *from, struct cpuset *to) static void move_member_tasks_to_cpuset(struct cpuset *from, struct cpuset *to)
{ {
struct cpuset_hotplug_scanner scan; struct cgroup_scanner scan;
scan.scan.cg = from->css.cgroup; scan.cg = from->css.cgroup;
scan.scan.test_task = NULL; /* select all tasks in cgroup */ scan.test_task = NULL; /* select all tasks in cgroup */
scan.scan.process_task = cpuset_do_move_task; scan.process_task = cpuset_do_move_task;
scan.scan.heap = NULL; scan.heap = NULL;
scan.to = to->css.cgroup; scan.data = to->css.cgroup;
if (cgroup_scan_tasks(&scan.scan)) if (cgroup_scan_tasks(&scan))
printk(KERN_ERR "move_member_tasks_to_cpuset: " printk(KERN_ERR "move_member_tasks_to_cpuset: "
"cgroup_scan_tasks failed\n"); "cgroup_scan_tasks failed\n");
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册