From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Dec 2012 16:18:24 +0000 (-0800)
Subject: Merge branch 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
X-Git-Tag: MMI-PSA29.97-13-9~15413
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d206e09036d6201f90b2719484c8a59526c46125;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for-3.8' of git://git./linux/kernel/git/tj/cgroup

Pull cgroup changes from Tejun Heo:
 "A lot of activities on cgroup side.  The big changes are focused on
  making cgroup hierarchy handling saner.

   - cgroup_rmdir() had peculiar semantics - it allowed cgroup
     destruction to be vetoed by individual controllers and tried to
     drain refcnt synchronously.  The vetoing never worked properly and
     caused good deal of contortions in cgroup.  memcg was the last
     reamining user.  Michal Hocko removed the usage and cgroup_rmdir()
     path has been simplified significantly.  This was done in a
     separate branch so that the memcg people can base further memcg
     changes on top.

   - The above allowed cleaning up cgroup lifecycle management and
     implementation of generic cgroup iterators which are used to
     improve hierarchy support.

   - cgroup_freezer updated to allow migration in and out of a frozen
     cgroup and handle hierarchy.  If a cgroup is frozen, all descendant
     cgroups are frozen.

   - netcls_cgroup and netprio_cgroup updated to handle hierarchy
     properly.

   - Various fixes and cleanups.

   - Two merge commits.  One to pull in memcg and rmdir cleanups (needed
     to build iterators).  The other pulled in cgroup/for-3.7-fixes for
     device_cgroup fixes so that further device_cgroup patches can be
     stacked on top."

Fixed up a trivial conflict in mm/memcontrol.c as per Tejun (due to
commit bea8c150a7 ("memcg: fix hotplugged memory zone oops") in master
touching code close to commit 2ef37d3fe4 ("memcg: Simplify
mem_cgroup_force_empty_list error handling") in for-3.8)

* 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (65 commits)
  cgroup: update Documentation/cgroups/00-INDEX
  cgroup_rm_file: don't delete the uncreated files
  cgroup: remove subsystem files when remounting cgroup
  cgroup: use cgroup_addrm_files() in cgroup_clear_directory()
  cgroup: warn about broken hierarchies only after css_online
  cgroup: list_del_init() on removed events
  cgroup: fix lockdep warning for event_control
  cgroup: move list add after list head initilization
  netprio_cgroup: allow nesting and inherit config on cgroup creation
  netprio_cgroup: implement netprio[_set]_prio() helpers
  netprio_cgroup: use cgroup->id instead of cgroup_netprio_state->prioidx
  netprio_cgroup: reimplement priomap expansion
  netprio_cgroup: shorten variable names in extend_netdev_table()
  netprio_cgroup: simplify write_priomap()
  netcls_cgroup: move config inheritance to ->css_online() and remove .broken_hierarchy marking
  cgroup: remove obsolete guarantee from cgroup_task_migrate.
  cgroup: add cgroup->id
  cgroup, cpuset: remove cgroup_subsys->post_clone()
  cgroup: s/CGRP_CLONE_CHILDREN/CGRP_CPUSET_CLONE_CHILDREN/
  cgroup: rename ->create/post_create/pre_destroy/destroy() to ->css_alloc/online/offline/free()
  ...
---

d206e09036d6201f90b2719484c8a59526c46125
diff --cc mm/memcontrol.c
index cf6d0df4849c,8b0b2b028e23..12307b3838fb
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@@ -3712,30 -3673,32 +3706,32 @@@ unsigned long mem_cgroup_soft_limit_rec
  	return nr_reclaimed;
  }
  
- /*
+ /**
+  * mem_cgroup_force_empty_list - clears LRU of a group
+  * @memcg: group to clear
+  * @node: NUMA node
+  * @zid: zone id
+  * @lru: lru to to clear
+  *
   * Traverse a specified page_cgroup list and try to drop them all.  This doesn't
-  * reclaim the pages page themselves - it just removes the page_cgroups.
-  * Returns true if some page_cgroups were not freed, indicating that the caller
-  * must retry this operation.
+  * reclaim the pages page themselves - pages are moved to the parent (or root)
+  * group.
   */
- static bool mem_cgroup_force_empty_list(struct mem_cgroup *memcg,
+ static void mem_cgroup_force_empty_list(struct mem_cgroup *memcg,
  				int node, int zid, enum lru_list lru)
  {
 -	struct mem_cgroup_per_zone *mz;
 +	struct lruvec *lruvec;
- 	unsigned long flags, loop;
+ 	unsigned long flags;
  	struct list_head *list;
  	struct page *busy;
  	struct zone *zone;
  
  	zone = &NODE_DATA(node)->node_zones[zid];
 -	mz = mem_cgroup_zoneinfo(memcg, node, zid);
 -	list = &mz->lruvec.lists[lru];
 +	lruvec = mem_cgroup_zone_lruvec(zone, memcg);
 +	list = &lruvec->lists[lru];
  
- 	loop = mem_cgroup_get_lru_size(lruvec, lru);
- 	/* give some margin against EBUSY etc...*/
- 	loop += 256;
  	busy = NULL;
- 	while (loop--) {
+ 	do {
  		struct page_cgroup *pc;
  		struct page *page;