From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [folded] memcg-fix-swap-accounting-update.patch removed from -mm tree Date: Wed, 17 Jun 2009 15:49:03 -0700 Message-ID: <200906172249.n5HMn3u3009068@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:47354 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756596AbZFQWtV (ORCPT ); Wed, 17 Jun 2009 18:49:21 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: kamezawa.hiroyu@jp.fujitsu.com, balbir@linux.vnet.ibm.com, dhaval@linux.vnet.ibm.com, hannes@cmpxchg.org, hugh.dickins@tiscali.co.uk, lizf@cn.fujitsu.com, nishimura@mxp.nes.nec.co.jp The patch titled memcg-fix-swap-accounting-update has been removed from the -mm tree. Its filename was memcg-fix-swap-accounting-update.patch This patch was dropped because it was folded into memcg-fix-swap-accounting.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: memcg-fix-swap-accounting-update From: KAMEZAWA Hiroyuki This is a replacement for memcg-fix-swap-accounting.patch in mmotm. Adjusted to style changes in 2/4 and 3/4. Acked-by: Balbir Singh Signed-off-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Cc: Hugh Dickins Cc: Johannes Weiner Cc: Li Zefan Cc: Dhaval Giani Cc: YAMAMOTO Takashi Signed-off-by: Andrew Morton --- include/linux/swap.h | 4 ++-- mm/memcontrol.c | 2 +- mm/swapfile.c | 8 +++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff -puN include/linux/swap.h~memcg-fix-swap-accounting-update include/linux/swap.h --- a/include/linux/swap.h~memcg-fix-swap-accounting-update +++ a/include/linux/swap.h @@ -320,10 +320,10 @@ static inline void disable_swap_token(vo #ifdef CONFIG_CGROUP_MEM_RES_CTLR extern void -mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, int swapout); +mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout); #else static inline void -mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, int swapout) +mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout) { } #endif diff -puN mm/memcontrol.c~memcg-fix-swap-accounting-update mm/memcontrol.c --- a/mm/memcontrol.c~memcg-fix-swap-accounting-update +++ a/mm/memcontrol.c @@ -1559,7 +1559,7 @@ void mem_cgroup_uncharge_cache_page(stru * memcg information is recorded to swap_cgroup of "ent" */ void -mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, int swapout) +mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout) { struct mem_cgroup *memcg; int ctype = MEM_CGROUP_CHARGE_TYPE_SWAPOUT; diff -puN mm/swapfile.c~memcg-fix-swap-accounting-update mm/swapfile.c --- a/mm/swapfile.c~memcg-fix-swap-accounting-update +++ a/mm/swapfile.c @@ -614,12 +614,14 @@ void swapcache_free(swp_entry_t entry, s p = swap_info_get(entry); if (p) { - ret = swap_entry_free(p, entry, 1); + ret = swap_entry_free(p, entry, SWAP_CACHE); if (page) { + bool swapout; if (ret) - mem_cgroup_uncharge_swapcache(page, entry, 1); + swapout = true; /* the end of swap out */ else - mem_cgroup_uncharge_swapcache(page, entry, 0); + swapout = false; /* no more swap users! */ + mem_cgroup_uncharge_swapcache(page, entry, swapout); } spin_unlock(&swap_lock); } _ Patches currently in -mm which might be from kamezawa.hiroyu@jp.fujitsu.com are origin.patch cgroups-forbid-noprefix-if-mounting-more-than-just-cpuset-subsystem.patch memcg-add-file-based-rss-accounting.patch memcg-remove-mem_cgroup_cache_charge_swapin.patch memcg-remove-some-redundant-checks.patch memcg-remove-unneeded-forward-declaration-from-schedh.patch memcg-fix-swap-accounting.patch memcg-fix-swap-accounting-update.patch memcg-fix-behavior-under-memorylimit-equals-to-memswlimit.patch memcg-add-interface-to-reset-limits.patch memcg-fix-lru-rotation-in-isolate_pages.patch