For file pages we don't deposit page table on mapping: no need to
withdraw it.

Signed-off-by: Kirill A. Shutemov <[email protected]>
---
 mm/huge_memory.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 732bda42ca80..8fd5a3c58353 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1654,10 +1654,16 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct 
vm_area_struct *vma,
                struct page *page = pmd_page(orig_pmd);
                page_remove_rmap(page, true);
                VM_BUG_ON_PAGE(page_mapcount(page) < 0, page);
-               add_mm_counter(tlb->mm, MM_ANONPAGES, -HPAGE_PMD_NR);
                VM_BUG_ON_PAGE(!PageHead(page), page);
-               pte_free(tlb->mm, pgtable_trans_huge_withdraw(tlb->mm, pmd));
-               atomic_long_dec(&tlb->mm->nr_ptes);
+               if (PageAnon(page)) {
+                       pgtable_t pgtable;
+                       pgtable = pgtable_trans_huge_withdraw(tlb->mm, pmd);
+                       pte_free(tlb->mm, pgtable);
+                       atomic_long_dec(&tlb->mm->nr_ptes);
+                       add_mm_counter(tlb->mm, MM_ANONPAGES, -HPAGE_PMD_NR);
+               } else {
+                       add_mm_counter(tlb->mm, MM_FILEPAGES, -HPAGE_PMD_NR);
+               }
                spin_unlock(ptl);
                tlb_remove_page(tlb, page);
        }
-- 
2.7.0

Reply via email to