cgroup: remove cgroup_attach_task_current_cg()
PATCH 1/2 cgroup: remove cgroup_attach_task_current_cg()
It's just a wrapper of cgroup_attach_task_all(), and it's no longer used after commit 87d6a412bd1ed82c14cabd4b408003b23bbd2880 (vhost: fix attach to cgroups regression)
Signed-off-by Li Zefan <[email protected]>
--- include/linux/cgroup.h | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-)
include/linux/cgroup.h +0 -9
@@ -602,11 +602,6 @@ int cgroup_scan_tasks(struct cgroup_scanner *scan);int cgroup_attach_task (struct cgroup *,struct task_struct *);int cgroup_attach_task_all (struct task_struct *from,struct task_struct *); -static inline int cgroup_attach_task_current_cg (struct task_struct *tsk) -{ -return cgroup_attach_task_all (current, tsk); -} -/* * CSS ID is ID for cgroup_subsys_state structs under subsys. This only works * if cgroup_subsys.use_id == true. It can be used for looking up and scanning.
@@ -669,10 +664,6 @@ static inline int cgroup_attach_task_all(struct task_struct *from, {return 0 ; } -static inline int cgroup_attach_task_current_cg (struct task_struct *t) -{ -return 0 ; -}#endif /* !CONFIG_CGROUPS */
Signature · 1 line
1.7.3.1
PATCH 2/2 cgroup: move struct cgroup_pidlist out from the header file
It's internally used only.
Signed-off-by Li Zefan <[email protected]>
--- include/linux/cgroup.h | 32 -------------------------------- kernel/cgroup.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 32 deletions(-)
include/linux/cgroup.h +0 -32
@@ -160,38 +160,6 @@ enum { CGRP_CLONE_CHILDREN, }; -/* which pidlist file are we talking about? */ -enum cgroup_filetype { -CGROUP_FILE_PROCS , -CGROUP_FILE_TASKS , -}; - -/* -* A pidlist is a list of pids that virtually represents the contents of one -* of the cgroup files ("procs" or "tasks"). We keep a list of such pidlists, -* a pair (one each for procs, tasks) for each pid namespace that's relevant -* to the cgroup. -*/ -struct cgroup_pidlist { -/* -* used to find which pidlist is wanted. doesn't change as long as -* this particular list stays in the list. -*/ -struct {enum cgroup_filetype type;struct pid_namespace *ns; } key; -/* array of xids */ -pid_t *list; -/* how many elements the above list has */ -int length; -/* how many files are using the current array */ -int use_count; -/* each of these stored in a list by its cgroup */ -struct list_head links; -/* pointer to the cgroup we belong to, for list removal purposes */ -struct cgroup *owner; -/* protects the other fields */ -struct rw_semaphore mutex; -}; -struct cgroup {unsigned long flags;/* "unsigned long" so bitops work */
kernel/cgroup.c +32 -0
@@ -3043,6 +3043,38 @@ int cgroup_scan_tasks(struct cgroup_scanner *scan)* */ +/* which pidlist file are we talking about? */ +enum cgroup_filetype { +CGROUP_FILE_PROCS , +CGROUP_FILE_TASKS , +}; + +/* +* A pidlist is a list of pids that virtually represents the contents of one +* of the cgroup files ("procs" or "tasks"). We keep a list of such pidlists, +* a pair (one each for procs, tasks) for each pid namespace that's relevant +* to the cgroup. +*/ +struct cgroup_pidlist { +/* +* used to find which pidlist is wanted. doesn't change as long as +* this particular list stays in the list. +*/ +struct {enum cgroup_filetype type;struct pid_namespace *ns; } key; +/* array of xids */ +pid_t *list; +/* how many elements the above list has */ +int length; +/* how many files are using the current array */ +int use_count; +/* each of these stored in a list by its cgroup */ +struct list_head links; +/* pointer to the cgroup we belong to, for list removal purposes */ +struct cgroup *owner; +/* protects the other fields */ +struct rw_semaphore mutex; +}; +/* * The following two functions "fix" the issue where there are more pids * than kmalloc will give memory for; in such cases, we use vmalloc/vfree.
Signature · 1 line
1.7.3.1
Tejun Heo
maintainerRe: [PATCH 2/2] cgroup: move struct cgroup_pidlist out from the header file
Quoted 3 lines · Li Zefan
It's internally used only.
Signed-off-by Li Zefan <[email protected]>
Both applied to cgroup/for-3.4. Thanks!
Signature · 1 line
tejun