|
@@ -3093,8 +3093,6 @@ void mem_cgroup_uncharge_cache_page(struct page *page)
|
|
|
{
|
|
|
VM_BUG_ON(page_mapped(page));
|
|
|
VM_BUG_ON(page->mapping);
|
|
|
- if (PageSwapCache(page))
|
|
|
- return;
|
|
|
__mem_cgroup_uncharge_common(page, MEM_CGROUP_CHARGE_TYPE_CACHE, false);
|
|
|
}
|
|
|
|
|
@@ -3159,8 +3157,6 @@ mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout)
|
|
|
if (!swapout) /* this was a swap cache but the swap is unused ! */
|
|
|
ctype = MEM_CGROUP_CHARGE_TYPE_DROP;
|
|
|
|
|
|
- if (PageSwapCache(page))
|
|
|
- return;
|
|
|
memcg = __mem_cgroup_uncharge_common(page, ctype, false);
|
|
|
|
|
|
/*
|
|
@@ -3350,11 +3346,10 @@ void mem_cgroup_end_migration(struct mem_cgroup *memcg,
|
|
|
unused = oldpage;
|
|
|
}
|
|
|
anon = PageAnon(used);
|
|
|
- if (!PageSwapCache(unused))
|
|
|
- __mem_cgroup_uncharge_common(unused,
|
|
|
- anon ? MEM_CGROUP_CHARGE_TYPE_ANON
|
|
|
- : MEM_CGROUP_CHARGE_TYPE_CACHE,
|
|
|
- true);
|
|
|
+ __mem_cgroup_uncharge_common(unused,
|
|
|
+ anon ? MEM_CGROUP_CHARGE_TYPE_ANON
|
|
|
+ : MEM_CGROUP_CHARGE_TYPE_CACHE,
|
|
|
+ true);
|
|
|
css_put(&memcg->css);
|
|
|
/*
|
|
|
* We disallowed uncharge of pages under migration because mapcount
|