On Fri 21-03-14 12:54:03, Luís Henriques wrote: > On Fri, Mar 21, 2014 at 05:05:07AM -0700, Hugh Dickins wrote: > > On Fri, 21 Mar 2014, Luis Henriques wrote: > > > On Thu, Mar 20, 2014 at 09:40:20PM -0700, Hugh Dickins wrote: > > > > > > > > But the version for 3.10.34 (or perhaps now 3.10.35) is this below. > > > > Yes, more differences, and the old mem_cgroup_reparent_charges line > > > > is intentionally left in for 3.10 whereas it was removed for 3.12+: > > > > that's because the css/cgroup iterator changed in between, it used > > > > not to supply the root of the subtree, but nowadays it does. > > > > > > ... > > > > + rcu_read_lock(); > > > > + cgroup_for_each_descendant_post(iter, cont) { > > > > + rcu_read_unlock(); > > > > + mem_cgroup_reparent_charges(mem_cgroup_from_cont(iter)); > > > > + rcu_read_lock(); > > > > + } > > > > + rcu_read_unlock(); > > > > mem_cgroup_reparent_charges(memcg); > > > > > > Is this correct? ^^^ > > > > > > I may be missing something, but I believe this call to > > > mem_cgroup_reparent_charges() should be dropped (as in the original commit > > > and in your 3.13 backport). > > > > Well spotted, but turn your eye to my comment before the patch :) > > Or maybe Greg should add that into 3.10-stable's comment itself, > > to help when it's reviewed later: I'll leave that to him. > > > > Hugh > > -- > > To unsubscribe from this list: send the line "unsubscribe stable" in > > the body of a message to majordomo@xxxxxxxxxxxxxxx > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > Now _this_ is embarrassing... /me slaps himself for not seeing it! :-) > > Sorry for the noise. There is nothing to be ashamed of. There are 3 slightly different backports depending on the kernel version as the semantic of cgroup iterators changed a lot recently. Better be worry than sorry... ;) -- Michal Hocko SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html