diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2015-12-21 16:01:10 +0530 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2016-02-16 13:53:46 -0800 |
| commit | 703920c14a3caa66862bd12b88a7ed6460ebef6b (patch) | |
| tree | 5a34a327d91a0ba0f6158c34d63c575ef4566b5b /include/linux | |
| parent | 69db8fca423ad74f6a16f7d499b5a1006335e4df (diff) | |
cgroup: refactor allow_attach handler for 4.4
Refactor *allow_attach() handler to align it with the changes
from mainline commit 1f7dd3e5a6e4 "cgroup: fix handling of
multi-destination migration from subtree_control enabling".
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cgroup-defs.h | 3 | ||||
| -rw-r--r-- | include/linux/cgroup.h | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index f3425da070e1..4a4eea01956c 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -422,8 +422,7 @@ struct cgroup_subsys { void (*css_reset)(struct cgroup_subsys_state *css); void (*css_e_css_changed)(struct cgroup_subsys_state *css); - int (*allow_attach)(struct cgroup_subsys_state *css, - struct cgroup_taskset *tset); + int (*allow_attach)(struct cgroup_taskset *tset); int (*can_attach)(struct cgroup_taskset *tset); void (*cancel_attach)(struct cgroup_taskset *tset); void (*attach)(struct cgroup_taskset *tset); diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 1cb19feddcb2..70358b9f5a7a 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -535,8 +535,7 @@ static inline void pr_cont_cgroup_path(struct cgroup *cgrp) * running as root. * Returns 0 if this is allowed, or -EACCES otherwise. */ -int subsys_cgroup_allow_attach(struct cgroup_subsys_state *css, - struct cgroup_taskset *tset); +int subsys_cgroup_allow_attach(struct cgroup_taskset *tset); #else /* !CONFIG_CGROUPS */ @@ -563,8 +562,7 @@ static inline void cgroup_free(struct task_struct *p) {} static inline int cgroup_init_early(void) { return 0; } static inline int cgroup_init(void) { return 0; } -static inline int subsys_cgroup_allow_attach(struct cgroup_subsys_state *css, - void *tset) +static inline int subsys_cgroup_allow_attach(void *tset) { return -EINVAL; } |