Merge branch 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup updates from Tejun Heo: "The bulk of changes are cleanups and preparations for the upcoming kernfs conversion. - cgroup_event mechanism which is and will be used only by memcg is moved to memcg. - pidlist handling is updated so that it can be served by seq_file. Also, the list is not sorted if sane_behavior. cgroup documentation explicitly states that the file is not sorted but it has been for quite some time. - All cgroup file handling now happens on top of seq_file. This is to prepare for kernfs conversion. In addition, all operations are restructured so that they map 1-1 to kernfs operations. - Other cleanups and low-pri fixes" * 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (40 commits) cgroup: trivial style updates cgroup: remove stray references to css_id doc: cgroups: Fix typo in doc/cgroups cgroup: fix fail path in cgroup_load_subsys() cgroup: fix missing unlock on error in cgroup_load_subsys() cgroup: remove for_each_root_subsys() cgroup: implement for_each_css() cgroup: factor out cgroup_subsys_state creation into create_css() cgroup: combine css handling loops in cgroup_create() cgroup: reorder operations in cgroup_create() cgroup: make for_each_subsys() useable under cgroup_root_mutex cgroup: css iterations and css_from_dir() are safe under cgroup_mutex cgroup: unify pidlist and other file handling cgroup: replace cftype->read_seq_string() with cftype->seq_show() cgroup: attach cgroup_open_file to all cgroup files cgroup: generalize cgroup_pidlist_open_file cgroup: unify read path so that seq_file is always used cgroup: unify cgroup_write_X64() and cgroup_write_string() cgroup: remove cftype->read(), ->read_map() and ->write() hugetlb_cgroup: convert away from cftype->read() ...
No related branches found
No related tags found
Showing
- Documentation/cgroups/cgroups.txt 0 additions, 20 deletionsDocumentation/cgroups/cgroups.txt
- Documentation/cgroups/memory.txt 2 additions, 2 deletionsDocumentation/cgroups/memory.txt
- Documentation/cgroups/resource_counter.txt 2 additions, 2 deletionsDocumentation/cgroups/resource_counter.txt
- block/blk-throttle.c 15 additions, 20 deletionsblock/blk-throttle.c
- block/cfq-iosched.c 58 additions, 73 deletionsblock/cfq-iosched.c
- drivers/md/bcache/request.c 0 additions, 1 deletiondrivers/md/bcache/request.c
- include/linux/cgroup.h 44 additions, 68 deletionsinclude/linux/cgroup.h
- include/linux/vmpressure.h 3 additions, 5 deletionsinclude/linux/vmpressure.h
- init/Kconfig 1 addition, 2 deletionsinit/Kconfig
- kernel/cgroup.c 480 additions, 722 deletionskernel/cgroup.c
- kernel/cgroup_freezer.c 3 additions, 4 deletionskernel/cgroup_freezer.c
- kernel/cpuset.c 23 additions, 48 deletionskernel/cpuset.c
- kernel/sched/core.c 6 additions, 7 deletionskernel/sched/core.c
- kernel/sched/cpuacct.c 8 additions, 10 deletionskernel/sched/cpuacct.c
- mm/hugetlb_cgroup.c 8 additions, 14 deletionsmm/hugetlb_cgroup.c
- mm/memcontrol.c 352 additions, 74 deletionsmm/memcontrol.c
- mm/page_cgroup.c 1 addition, 1 deletionmm/page_cgroup.c
- mm/vmpressure.c 9 additions, 17 deletionsmm/vmpressure.c
- net/core/netprio_cgroup.c 4 additions, 4 deletionsnet/core/netprio_cgroup.c
- security/device_cgroup.c 3 additions, 4 deletionssecurity/device_cgroup.c
Loading
Please register or sign in to comment