Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup updates from Tejun Heo: - xattr support added. The implementation is shared with tmpfs. The usage is restricted and intended to be used to manage per-cgroup metadata by system software. tmpfs changes are routed through this branch with Hugh's permission. - cgroup subsystem ID handling simplified. * 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: cgroup: Define CGROUP_SUBSYS_COUNT according the configuration cgroup: Assign subsystem IDs during compile time cgroup: Do not depend on a given order when populating the subsys array cgroup: Wrap subsystem selection macro cgroup: Remove CGROUP_BUILTIN_SUBSYS_COUNT cgroup: net_prio: Do not define task_netpioidx() when not selected cgroup: net_cls: Do not define task_cls_classid() when not selected cgroup: net_cls: Move sock_update_classid() declaration to cls_cgroup.h cgroup: trivial fixes for Documentation/cgroups/cgroups.txt xattr: mark variable as uninitialized to make both gcc and smatch happy fs: add missing documentation to simple_xattr functions cgroup: add documentation on extended attributes usage cgroup: rename subsys_bits to subsys_mask cgroup: add xattr support cgroup: revise how we re-populate root directory xattr: extract simple_xattr code from tmpfs
Showing
- Documentation/cgroups/cgroups.txt 56 additions, 36 deletionsDocumentation/cgroups/cgroups.txt
- drivers/net/tun.c 1 addition, 0 deletionsdrivers/net/tun.c
- fs/xattr.c 180 additions, 0 deletionsfs/xattr.c
- include/linux/cgroup.h 15 additions, 10 deletionsinclude/linux/cgroup.h
- include/linux/cgroup_subsys.h 12 additions, 12 deletionsinclude/linux/cgroup_subsys.h
- include/linux/shmem_fs.h 2 additions, 1 deletioninclude/linux/shmem_fs.h
- include/linux/xattr.h 48 additions, 0 deletionsinclude/linux/xattr.h
- include/net/cls_cgroup.h 15 additions, 12 deletionsinclude/net/cls_cgroup.h
- include/net/netprio_cgroup.h 10 additions, 20 deletionsinclude/net/netprio_cgroup.h
- include/net/sock.h 0 additions, 8 deletionsinclude/net/sock.h
- kernel/cgroup.c 219 additions, 101 deletionskernel/cgroup.c
- mm/shmem.c 13 additions, 158 deletionsmm/shmem.c
- net/core/netprio_cgroup.c 0 additions, 11 deletionsnet/core/netprio_cgroup.c
- net/core/sock.c 4 additions, 11 deletionsnet/core/sock.c
- net/sched/cls_cgroup.c 0 additions, 13 deletionsnet/sched/cls_cgroup.c
Loading
Please register or sign in to comment