1 files changed, 5 insertions, 8 deletions

diff --git a/mm/memory.c b/mm/memory.c
index 57361708d1a5..6bef278ad303 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1060,7 +1060,7 @@ int copy_page_range(struct mm_struct *dst_mm, struct mm_struct *src_mm,
                  * We do not free on error cases below as remove_vma
                  * gets called on error from higher level routine
                  */
-                ret = track_pfn_vma_copy(vma);
+                ret = track_pfn_copy(vma);
                 if (ret)
                         return ret;
         }
@@ -1328,7 +1328,7 @@ static void unmap_single_vma(struct mmu_gather *tlb,
                 uprobe_munmap(vma, start, end);
 
         if (unlikely(is_pfn_mapping(vma)))
-                untrack_pfn_vma(vma, 0, 0);
+                untrack_pfn(vma, 0, 0);
 
         if (start != end) {
                 if (unlikely(is_vm_hugetlb_page(vma))) {
@@ -2162,14 +2162,11 @@ int vm_insert_pfn(struct vm_area_struct *vma, unsigned long addr,
 
         if (addr < vma->vm_start || addr >= vma->vm_end)
                 return -EFAULT;
-        if (track_pfn_vma_new(vma, &pgprot, pfn, PAGE_SIZE))
+        if (track_pfn_insert(vma, &pgprot, pfn))
                 return -EINVAL;
 
         ret = insert_pfn(vma, addr, pfn, pgprot);
 
-        if (ret)
-                untrack_pfn_vma(vma, pfn, PAGE_SIZE);
-
         return ret;
 }
 EXPORT_SYMBOL(vm_insert_pfn);
@@ -2311,7 +2308,7 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr,
 
         vma->vm_flags |= VM_IO | VM_RESERVED | VM_PFNMAP;
 
-        err = track_pfn_vma_new(vma, &prot, pfn, PAGE_ALIGN(size));
+        err = track_pfn_remap(vma, &prot, pfn, PAGE_ALIGN(size));
         if (err) {
                 /*
                  * To indicate that track_pfn related cleanup is not
@@ -2335,7 +2332,7 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr,
         } while (pgd++, addr = next, addr != end);
 
         if (err)
-                untrack_pfn_vma(vma, pfn, PAGE_ALIGN(size));
+                untrack_pfn(vma, pfn, PAGE_ALIGN(size));
 
         return err;
 }