• Linus Torvalds's avatar
    Merge branch 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · f075e0f6
    Linus Torvalds authored
    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()
      ...
    f075e0f6
memcontrol.c 194 KB