OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

memcg swap: mem_cgroup_move_swap_account never needs fixup 

The need_fixup arg to mem_cgroup_move_swap_account() is always false,
so just remove it.

Signed-off-by: Hugh Dickins <hughd@google.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Hugh Dickins 2012-05-29 15:06:51 -07:00 committed by Linus Torvalds
parent 4b91355e9d
commit e91cbb4253
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mm/memcontrol.c
View File

@ -3165,7 +3165,6 @@ void mem_cgroup_uncharge_swap(swp_entry_t ent)
* @entry: swap entry to be moved * @entry: swap entry to be moved
* @from: mem_cgroup which the entry is moved from * @from: mem_cgroup which the entry is moved from
* @to: mem_cgroup which the entry is moved to * @to: mem_cgroup which the entry is moved to
* @need_fixup: whether we should fixup res_counters and refcounts.
* *
* It succeeds only when the swap_cgroup's record for this entry is the same * It succeeds only when the swap_cgroup's record for this entry is the same
* as the mem_cgroup's id of @from. * as the mem_cgroup's id of @from.
@ -3176,7 +3175,7 @@ void mem_cgroup_uncharge_swap(swp_entry_t ent)
* both res and memsw, and called css_get(). * both res and memsw, and called css_get().
*/ */
static int mem_cgroup_move_swap_account(swp_entry_t entry, static int mem_cgroup_move_swap_account(swp_entry_t entry,
struct mem_cgroup *from, struct mem_cgroup *to, bool need_fixup) struct mem_cgroup *from, struct mem_cgroup *to)
{ {
unsigned short old_id, new_id; unsigned short old_id, new_id;
@ -3195,24 +3194,13 @@ static int mem_cgroup_move_swap_account(swp_entry_t entry,
* swap-in, the refcount of @to might be decreased to 0. * swap-in, the refcount of @to might be decreased to 0.
*/ */
mem_cgroup_get(to); mem_cgroup_get(to);
if (need_fixup) {
if (!mem_cgroup_is_root(from))
res_counter_uncharge(&from->memsw, PAGE_SIZE);
mem_cgroup_put(from);
/*
* we charged both to->res and to->memsw, so we should
* uncharge to->res.
*/
if (!mem_cgroup_is_root(to))
res_counter_uncharge(&to->res, PAGE_SIZE);
}
return 0; return 0;
} }
return -EINVAL; return -EINVAL;
} }
#else #else
static inline int mem_cgroup_move_swap_account(swp_entry_t entry, static inline int mem_cgroup_move_swap_account(swp_entry_t entry,
struct mem_cgroup *from, struct mem_cgroup *to, bool need_fixup) struct mem_cgroup *from, struct mem_cgroup *to)
{ {
return -EINVAL; return -EINVAL;
} }
@ -5546,8 +5534,7 @@ put: /* get_mctgt_type() gets the page */
break; break;
case MC_TARGET_SWAP: case MC_TARGET_SWAP:
ent = target.ent; ent = target.ent;
if (!mem_cgroup_move_swap_account(ent, if (!mem_cgroup_move_swap_account(ent, mc.from, mc.to)) {
mc.from, mc.to, false)) {
mc.precharge--; mc.precharge--;
/* we fixup refcnts and charges later. */ /* we fixup refcnts and charges later. */
mc.moved_swap++; mc.moved_swap++;