1 files changed, 13 insertions, 12 deletions

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index d8534b3630e4..00ddfcdd810e 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1281,18 +1281,19 @@ int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
         struct anon_vma *anon_vma = NULL;
         struct page *page;
         unsigned long haddr = addr & HPAGE_PMD_MASK;
+        int page_nid = -1, this_nid = numa_node_id();
         int target_nid;
-        int current_nid = -1;
-        bool migrated, page_locked;
+        bool page_locked;
+        bool migrated = false;
 
         spin_lock(&mm->page_table_lock);
         if (unlikely(!pmd_same(pmd, *pmdp)))
                 goto out_unlock;
 
         page = pmd_page(pmd);
-        current_nid = page_to_nid(page);
+        page_nid = page_to_nid(page);
         count_vm_numa_event(NUMA_HINT_FAULTS);
-        if (current_nid == numa_node_id())
+        if (page_nid == this_nid)
                 count_vm_numa_event(NUMA_HINT_FAULTS_LOCAL);
 
         /*
@@ -1335,19 +1336,18 @@ int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
         spin_unlock(&mm->page_table_lock);
         migrated = migrate_misplaced_transhuge_page(mm, vma,
                                 pmdp, pmd, addr, page, target_nid);
-        if (!migrated)
+        if (migrated)
+                page_nid = target_nid;
+        else
                 goto check_same;
 
-        task_numa_fault(target_nid, HPAGE_PMD_NR, true);
-        if (anon_vma)
-                page_unlock_anon_vma_read(anon_vma);
-        return 0;
+        goto out;
 
 check_same:
         spin_lock(&mm->page_table_lock);
         if (unlikely(!pmd_same(pmd, *pmdp))) {
                 /* Someone else took our fault */
-                current_nid = -1;
+                page_nid = -1;
                 goto out_unlock;
         }
 clear_pmdnuma:
@@ -1362,8 +1362,9 @@ out:
         if (anon_vma)
                 page_unlock_anon_vma_read(anon_vma);
 
-        if (current_nid != -1)
-                task_numa_fault(current_nid, HPAGE_PMD_NR, false);
+        if (page_nid != -1)
+                task_numa_fault(page_nid, HPAGE_PMD_NR, migrated);
+
         return 0;
 }