cgroup: Remove leftover instances of allow_attach
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:
@@ -2061,30 +2061,12 @@ static void cpuset_bind(struct cgroup_subsys_state *root_css)
|
||||
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;
|
||||
}
|
||||
|
||||
struct cgroup_subsys cpuset_cgrp_subsys = {
|
||||
.css_alloc = cpuset_css_alloc,
|
||||
.css_online = cpuset_css_online,
|
||||
.css_offline = cpuset_css_offline,
|
||||
.css_free = cpuset_css_free,
|
||||
.can_attach = cpuset_can_attach,
|
||||
.allow_attach = cpuset_allow_attach,
|
||||
.cancel_attach = cpuset_cancel_attach,
|
||||
.attach = cpuset_attach,
|
||||
.bind = cpuset_bind,
|
||||
|
||||
@@ -368,12 +368,6 @@ void schedtune_enqueue_task(struct task_struct *p, int cpu)
|
||||
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)
|
||||
{
|
||||
struct task_struct *task;
|
||||
@@ -715,7 +709,6 @@ schedtune_css_free(struct cgroup_subsys_state *css)
|
||||
struct cgroup_subsys schedtune_cgrp_subsys = {
|
||||
.css_alloc = schedtune_css_alloc,
|
||||
.css_free = schedtune_css_free,
|
||||
.allow_attach = schedtune_allow_attach,
|
||||
.can_attach = schedtune_can_attach,
|
||||
.cancel_attach = schedtune_cancel_attach,
|
||||
.legacy_cftypes = files,
|
||||
|
||||
Reference in New Issue
Block a user