From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from m6.gw.fujitsu.co.jp ([10.0.50.76]) by fgwmail7.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id mB5DOH9m024304 for (envelope-from kamezawa.hiroyu@jp.fujitsu.com); Fri, 5 Dec 2008 22:24:17 +0900 Received: from smail (m6 [127.0.0.1]) by outgoing.m6.gw.fujitsu.co.jp (Postfix) with ESMTP id 6A23E45DD72 for ; Fri, 5 Dec 2008 22:24:17 +0900 (JST) Received: from s6.gw.fujitsu.co.jp (s6.gw.fujitsu.co.jp [10.0.50.96]) by m6.gw.fujitsu.co.jp (Postfix) with ESMTP id C50D545DE53 for ; Fri, 5 Dec 2008 22:24:16 +0900 (JST) Received: from s6.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s6.gw.fujitsu.co.jp (Postfix) with ESMTP id A81711DB8037 for ; Fri, 5 Dec 2008 22:24:16 +0900 (JST) Received: from ml13.s.css.fujitsu.com (ml13.s.css.fujitsu.com [10.249.87.103]) by s6.gw.fujitsu.co.jp (Postfix) with ESMTP id 4CB931DB8040 for ; Fri, 5 Dec 2008 22:24:16 +0900 (JST) Message-ID: <56721.10.75.179.61.1228483455.squirrel@webmail-b.css.fujitsu.com> In-Reply-To: <20081205212401.1f446c93.nishimura@mxp.nes.nec.co.jp> References: <20081205212208.31d904e0.nishimura@mxp.nes.nec.co.jp> <20081205212401.1f446c93.nishimura@mxp.nes.nec.co.jp> Date: Fri, 5 Dec 2008 22:24:15 +0900 (JST) Subject: Re: [RFC][PATCH -mmotm 2/4] memcg: remove mem_cgroup_try_charge From: "KAMEZAWA Hiroyuki" MIME-Version: 1.0 Content-Type: text/plain;charset=us-ascii Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org Return-Path: To: Daisuke Nishimura Cc: LKML , linux-mm , Balbir Singh , KAMEZAWA Hiroyuki , Pavel Emelyanov , Li Zefan , Paul Menage List-ID: Daisuke Nishimura said: > Now, mem_cgroup_try_charge is not used by anyone, so we can remove it. > > Signed-off-by: Daisuke Nishimura Not Now, but after patch [1/4] ;) Acked-by:KAMEZAWA Hiroyuki > --- > include/linux/memcontrol.h | 8 -------- > mm/memcontrol.c | 21 +-------------------- > 2 files changed, 1 insertions(+), 28 deletions(-) > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index fe82b58..4b35739 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -40,8 +40,6 @@ struct mm_struct; > extern int mem_cgroup_newpage_charge(struct page *page, struct mm_struct > *mm, > gfp_t gfp_mask); > /* for swap handling */ > -extern int mem_cgroup_try_charge(struct mm_struct *mm, > - gfp_t gfp_mask, struct mem_cgroup **ptr); > extern int mem_cgroup_try_charge_swapin(struct mm_struct *mm, > struct page *page, gfp_t mask, struct mem_cgroup **ptr); > extern void mem_cgroup_commit_charge_swapin(struct page *page, > @@ -135,12 +133,6 @@ static inline int mem_cgroup_cache_charge(struct page > *page, > return 0; > } > > -static inline int mem_cgroup_try_charge(struct mm_struct *mm, > - gfp_t gfp_mask, struct mem_cgroup **ptr) > -{ > - return 0; > -} > - > static inline int mem_cgroup_try_charge_swapin(struct mm_struct *mm, > struct page *page, gfp_t gfp_mask, struct mem_cgroup **ptr) > { > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 50ee1be..9c5856b 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -808,27 +808,8 @@ nomem: > return -ENOMEM; > } > > -/** > - * mem_cgroup_try_charge - get charge of PAGE_SIZE. > - * @mm: an mm_struct which is charged against. (when *memcg is NULL) > - * @gfp_mask: gfp_mask for reclaim. > - * @memcg: a pointer to memory cgroup which is charged against. > - * > - * charge against memory cgroup pointed by *memcg. if *memcg == NULL, > estimated > - * memory cgroup from @mm is got and stored in *memcg. > - * > - * Returns 0 if success. -ENOMEM at failure. > - * This call can invoke OOM-Killer. > - */ > - > -int mem_cgroup_try_charge(struct mm_struct *mm, > - gfp_t mask, struct mem_cgroup **memcg) > -{ > - return __mem_cgroup_try_charge(mm, mask, memcg, true); > -} > - > /* > - * commit a charge got by mem_cgroup_try_charge() and makes page_cgroup > to be > + * commit a charge got by __mem_cgroup_try_charge() and makes page_cgroup > to be > * USED state. If already USED, uncharge and return. > */ > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org