Messages in this thread | | | Date | Thu, 19 Jul 2012 12:45:54 +0300 | From | "Kirill A. Shutemov" <> | Subject | Re: [PATCH] mm/memcg: wrap mem_cgroup_from_css function |
| |
On Thu, Jul 19, 2012 at 05:38:35PM +0800, Gavin Shan wrote: > On Thu, Jul 19, 2012 at 05:23:09PM +0800, Wanpeng Li wrote: > >On Thu, Jul 19, 2012 at 12:14:20PM +0300, Kirill A. Shutemov wrote: > >>On Wed, Jul 18, 2012 at 11:05:30AM +0800, Wanpeng Li wrote: > >>> wrap mem_cgroup_from_css function to clarify get mem cgroup > >>> from cgroup_subsys_state. > >>> > >>> Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com> > >>> Cc: Michal Hocko <mhocko@suse.cz> > >>> Cc: Johannes Weiner <hannes@cmpxchg.org> > >>> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> > >>> Cc: Andrew Morton <akpm@linux-foundation.org> > >>> Cc: Gavin Shan <shangw@linux.vnet.ibm.com> > >>> Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com> > >>> Cc: linux-kernel@vger.kernel.org > >>> --- > >>> mm/memcontrol.c | 14 ++++++++++---- > >>> 1 files changed, 10 insertions(+), 4 deletions(-) > >>> > >>> diff --git a/mm/memcontrol.c b/mm/memcontrol.c > >>> index 58a08fc..20f6a15 100644 > >>> --- a/mm/memcontrol.c > >>> +++ b/mm/memcontrol.c > >>> @@ -396,6 +396,12 @@ static void mem_cgroup_put(struct mem_cgroup *memcg); > >>> #include <net/sock.h> > >>> #include <net/ip.h> > >>> > >>> +static inline > >>> +struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *s) > >>> +{ > >>> + return container_of(s, struct mem_cgroup, css); > >>> +} > >>> + > >>> static bool mem_cgroup_is_root(struct mem_cgroup *memcg); > >>> void sock_update_memcg(struct sock *sk) > >>> { > >>> @@ -820,7 +826,7 @@ static void memcg_check_events(struct mem_cgroup *memcg, struct page *page) > >>> > >>> struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont) > >>> { > >>> - return container_of(cgroup_subsys_state(cont, > >>> + return mem_cgroup_from_css(cgroup_subsys_state(cont, > >>> mem_cgroup_subsys_id), struct mem_cgroup, > >>> css); > >> > >>Hm?.. Here and below too many args to mem_cgroup_from_css(). > >>Have you tested the code? > > > >Hi, what's the meaning of "two many"? > > > > It might be the typo for "two" here.
Oops.. You're right.
-- Kirill A. Shutemov
| |