evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cgroup: Remove leftover instances of allow_attach

Browse source 
Fix:

kernel/sched/tune.c:718:2: error:
	unknown field ‘allow_attach’ specified in initializer
kernel/cpuset.c:2087:2: error:
	unknown field 'allow_attach' specified in initializer

Change-Id: Ie524350ffc6158f3182d90095cca502e58b6f197
Fixes: e78f134a78 ("CHROMIUM: remove Android's cgroup generic permissions checks")
Signed-off-by: Guenter Roeck <groeck@chromium.org>
This commit is contained in:
Guenter Roeck 2016-10-18 12:35:03 -07:00 • committed by Amit Pundir
parent 824e71d68a
commit 172724332a
2 changed files with 0 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
kernel/cpuset.c
View file

@ -2095,23 +2095,6 @@ static void cpuset_bind(struct cgroup_subsys_state *root_css)
mutex_unlock(&cpuset_mutex); mutex_unlock(&cpuset_mutex);
} }
static int cpuset_allow_attach(struct cgroup_taskset *tset)
{
const struct cred *cred = current_cred(), *tcred;
struct task_struct *task;
struct cgroup_subsys_state *css;
cgroup_taskset_for_each(task, css, tset) {
tcred = __task_cred(task);
if ((current != task) && !capable(CAP_SYS_ADMIN) &&
cred->euid.val != tcred->uid.val && cred->euid.val != tcred->suid.val)
return -EACCES;
}
return 0;
}
/* /*
* Make sure the new task conform to the current state of its parent, * Make sure the new task conform to the current state of its parent,
* which could have been changed by cpuset just after it inherits the * which could have been changed by cpuset just after it inherits the
@ -2132,7 +2115,6 @@ struct cgroup_subsys cpuset_cgrp_subsys = {
.css_offline = cpuset_css_offline, .css_offline = cpuset_css_offline,
.css_free = cpuset_css_free, .css_free = cpuset_css_free,
.can_attach = cpuset_can_attach, .can_attach = cpuset_can_attach,
.allow_attach = cpuset_allow_attach,
.cancel_attach = cpuset_cancel_attach, .cancel_attach = cpuset_cancel_attach,
.attach = cpuset_attach, .attach = cpuset_attach,
.post_attach = cpuset_post_attach, .post_attach = cpuset_post_attach,

7
kernel/sched/tune.c
View file

@ -368,12 +368,6 @@ void schedtune_enqueue_task(struct task_struct *p, int cpu)
raw_spin_unlock_irqrestore(&bg->lock, irq_flags); raw_spin_unlock_irqrestore(&bg->lock, irq_flags);
} }
int schedtune_allow_attach(struct cgroup_taskset *tset)
{
/* We always allows tasks to be moved between existing CGroups */
return 0;
}
int schedtune_can_attach(struct cgroup_taskset *tset) int schedtune_can_attach(struct cgroup_taskset *tset)
{ {
struct task_struct *task; struct task_struct *task;
@ -715,7 +709,6 @@ schedtune_css_free(struct cgroup_subsys_state *css)
struct cgroup_subsys schedtune_cgrp_subsys = { struct cgroup_subsys schedtune_cgrp_subsys = {
.css_alloc = schedtune_css_alloc, .css_alloc = schedtune_css_alloc,
.css_free = schedtune_css_free, .css_free = schedtune_css_free,
.allow_attach = schedtune_allow_attach,
.can_attach = schedtune_can_attach, .can_attach = schedtune_can_attach,
.cancel_attach = schedtune_cancel_attach, .cancel_attach = schedtune_cancel_attach,
.legacy_cftypes = files, .legacy_cftypes = files,