|
@@ -483,8 +483,7 @@ void __khugepaged_exit(struct mm_struct *mm)
|
|
|
|
|
|
static void release_pte_page(struct page *page)
|
|
static void release_pte_page(struct page *page)
|
|
{
|
|
{
|
|
- /* 0 stands for page_is_file_cache(page) == false */
|
|
|
|
- dec_node_page_state(page, NR_ISOLATED_ANON + 0);
|
|
|
|
|
|
+ dec_node_page_state(page, NR_ISOLATED_ANON + page_is_file_cache(page));
|
|
unlock_page(page);
|
|
unlock_page(page);
|
|
putback_lru_page(page);
|
|
putback_lru_page(page);
|
|
}
|
|
}
|
|
@@ -532,7 +531,6 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma,
|
|
|
|
|
|
VM_BUG_ON_PAGE(PageCompound(page), page);
|
|
VM_BUG_ON_PAGE(PageCompound(page), page);
|
|
VM_BUG_ON_PAGE(!PageAnon(page), page);
|
|
VM_BUG_ON_PAGE(!PageAnon(page), page);
|
|
- VM_BUG_ON_PAGE(!PageSwapBacked(page), page);
|
|
|
|
|
|
|
|
/*
|
|
/*
|
|
* We can do it before isolate_lru_page because the
|
|
* We can do it before isolate_lru_page because the
|
|
@@ -579,8 +577,8 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma,
|
|
result = SCAN_DEL_PAGE_LRU;
|
|
result = SCAN_DEL_PAGE_LRU;
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
- /* 0 stands for page_is_file_cache(page) == false */
|
|
|
|
- inc_node_page_state(page, NR_ISOLATED_ANON + 0);
|
|
|
|
|
|
+ inc_node_page_state(page,
|
|
|
|
+ NR_ISOLATED_ANON + page_is_file_cache(page));
|
|
VM_BUG_ON_PAGE(!PageLocked(page), page);
|
|
VM_BUG_ON_PAGE(!PageLocked(page), page);
|
|
VM_BUG_ON_PAGE(PageLRU(page), page);
|
|
VM_BUG_ON_PAGE(PageLRU(page), page);
|
|
|
|
|