Merge branch 'for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup changes from Tejun Heo: "Out of the 8 commits, one fixes a long-standing locking issue around tasklist walking and others are cleanups." * 'for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: cgroup: Walk task list under tasklist_lock in cgroup_enable_task_cg_list cgroup: Remove wrong comment on cgroup_enable_task_cg_list() cgroup: remove cgroup_subsys argument from callbacks cgroup: remove extra calls to find_existing_css_set cgroup: replace tasklist_lock with rcu_read_lock cgroup: simplify double-check locking in cgroup_attach_proc cgroup: move struct cgroup_pidlist out from the header file cgroup: remove cgroup_attach_task_current_cg()
This commit is contained in:
@@ -69,7 +69,7 @@ struct cgroup;
|
||||
struct cgroup_subsys;
|
||||
#ifdef CONFIG_NET
|
||||
int mem_cgroup_sockets_init(struct cgroup *cgrp, struct cgroup_subsys *ss);
|
||||
void mem_cgroup_sockets_destroy(struct cgroup *cgrp, struct cgroup_subsys *ss);
|
||||
void mem_cgroup_sockets_destroy(struct cgroup *cgrp);
|
||||
#else
|
||||
static inline
|
||||
int mem_cgroup_sockets_init(struct cgroup *cgrp, struct cgroup_subsys *ss)
|
||||
@@ -77,7 +77,7 @@ int mem_cgroup_sockets_init(struct cgroup *cgrp, struct cgroup_subsys *ss)
|
||||
return 0;
|
||||
}
|
||||
static inline
|
||||
void mem_cgroup_sockets_destroy(struct cgroup *cgrp, struct cgroup_subsys *ss)
|
||||
void mem_cgroup_sockets_destroy(struct cgroup *cgrp)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
@@ -871,8 +871,7 @@ struct proto {
|
||||
*/
|
||||
int (*init_cgroup)(struct cgroup *cgrp,
|
||||
struct cgroup_subsys *ss);
|
||||
void (*destroy_cgroup)(struct cgroup *cgrp,
|
||||
struct cgroup_subsys *ss);
|
||||
void (*destroy_cgroup)(struct cgroup *cgrp);
|
||||
struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
|
||||
#endif
|
||||
};
|
||||
|
Reference in New Issue
Block a user