linux-next: manual merge of the cgroup tree with Linus' tree

[Stephen Rothwell]

Hi Tejun,

Today's linux-next merge of the cgroup tree got a conflict in
mm/memcontrol.c between commit 6f6acb00514c ("memcg: fix swapcache
charge from kernel thread context") from Linus' tree and commit
ec903c0c858e ("cgroup: rename css_tryget*() to css_tryget_online*()")
from the cgroup tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc mm/memcontrol.c
index 5177c6d4a2dd,b6f91d61b3af..000000000000
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@@ -1077,19 -1074,10 +1074,19 @@@ static struct mem_cgroup *get_mem_cgrou
  
        rcu_read_lock();
        do {
 -              memcg = mem_cgroup_from_task(rcu_dereference(mm->owner));
 -              if (unlikely(!memcg))
 +              /*
 +               * Page cache insertions can happen withou an
 +               * actual mm context, e.g. during disk probing
 +               * on boot, loopback IO, acct() writes etc.
 +               */
 +              if (unlikely(!mm))
                        memcg = root_mem_cgroup;
 +              else {
 +                      memcg = 
mem_cgroup_from_task(rcu_dereference(mm->owner));
 +                      if (unlikely(!memcg))
 +                              memcg = root_mem_cgroup;
 +              }
-       } while (!css_tryget(&memcg->css));
+       } while (!css_tryget_online(&memcg->css));
        rcu_read_unlock();
        return memcg;
  }

signature.asc
Description: PGP signature