|
@@ -2748,19 +2748,11 @@ int mem_cgroup_newpage_charge(struct page *page,
|
|
|
{
|
|
|
if (mem_cgroup_disabled())
|
|
|
return 0;
|
|
|
- /*
|
|
|
- * If already mapped, we don't have to account.
|
|
|
- * If page cache, page->mapping has address_space.
|
|
|
- * But page->mapping may have out-of-use anon_vma pointer,
|
|
|
- * detecit it by PageAnon() check. newly-mapped-anon's page->mapping
|
|
|
- * is NULL.
|
|
|
- */
|
|
|
- if (page_mapped(page) || (page->mapping && !PageAnon(page)))
|
|
|
- return 0;
|
|
|
- if (unlikely(!mm))
|
|
|
- mm = &init_mm;
|
|
|
+ VM_BUG_ON(page_mapped(page));
|
|
|
+ VM_BUG_ON(page->mapping && !PageAnon(page));
|
|
|
+ VM_BUG_ON(!mm);
|
|
|
return mem_cgroup_charge_common(page, mm, gfp_mask,
|
|
|
- MEM_CGROUP_CHARGE_TYPE_MAPPED);
|
|
|
+ MEM_CGROUP_CHARGE_TYPE_MAPPED);
|
|
|
}
|
|
|
|
|
|
static void
|