diff options
author | Oleg Nesterov <oleg@redhat.com> | 2015-12-03 10:24:08 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2015-12-03 10:24:08 -0500 |
commit | b53202e6308939d33ba0c78712e850f891b4e76f (patch) | |
tree | 2c8998ba6b2580481a93352381a3f2d972901789 /kernel/fork.c | |
parent | 8075b542cf9f5d8a6afd92b4a940e29a677a7510 (diff) |
cgroup: kill cgrp_ss_priv[CGROUP_CANFORK_COUNT] and friends
Now that nobody use the "priv" arg passed to can_fork/cancel_fork/fork we can
kill CGROUP_CANFORK_COUNT/SUBSYS_TAG/etc and cgrp_ss_priv[] in copy_process().
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/fork.c')
-rw-r--r-- | kernel/fork.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index fce002ee3ddf..ba7d1c037490 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -1249,7 +1249,6 @@ static struct task_struct *copy_process(unsigned long clone_flags, | |||
1249 | { | 1249 | { |
1250 | int retval; | 1250 | int retval; |
1251 | struct task_struct *p; | 1251 | struct task_struct *p; |
1252 | void *cgrp_ss_priv[CGROUP_CANFORK_COUNT] = {}; | ||
1253 | 1252 | ||
1254 | if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS)) | 1253 | if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS)) |
1255 | return ERR_PTR(-EINVAL); | 1254 | return ERR_PTR(-EINVAL); |
@@ -1526,7 +1525,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, | |||
1526 | * between here and cgroup_post_fork() if an organisation operation is in | 1525 | * between here and cgroup_post_fork() if an organisation operation is in |
1527 | * progress. | 1526 | * progress. |
1528 | */ | 1527 | */ |
1529 | retval = cgroup_can_fork(p, cgrp_ss_priv); | 1528 | retval = cgroup_can_fork(p); |
1530 | if (retval) | 1529 | if (retval) |
1531 | goto bad_fork_free_pid; | 1530 | goto bad_fork_free_pid; |
1532 | 1531 | ||
@@ -1608,7 +1607,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, | |||
1608 | write_unlock_irq(&tasklist_lock); | 1607 | write_unlock_irq(&tasklist_lock); |
1609 | 1608 | ||
1610 | proc_fork_connector(p); | 1609 | proc_fork_connector(p); |
1611 | cgroup_post_fork(p, cgrp_ss_priv); | 1610 | cgroup_post_fork(p); |
1612 | threadgroup_change_end(current); | 1611 | threadgroup_change_end(current); |
1613 | perf_event_fork(p); | 1612 | perf_event_fork(p); |
1614 | 1613 | ||
@@ -1618,7 +1617,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, | |||
1618 | return p; | 1617 | return p; |
1619 | 1618 | ||
1620 | bad_fork_cancel_cgroup: | 1619 | bad_fork_cancel_cgroup: |
1621 | cgroup_cancel_fork(p, cgrp_ss_priv); | 1620 | cgroup_cancel_fork(p); |
1622 | bad_fork_free_pid: | 1621 | bad_fork_free_pid: |
1623 | if (pid != &init_struct_pid) | 1622 | if (pid != &init_struct_pid) |
1624 | free_pid(pid); | 1623 | free_pid(pid); |