mm/numa: do_numa_page() do_huge_pmd_numa_page() code clean up.
Subsystems (3)
Zi Yan
reviewerPATCH 1/1 mm/numa: do_numa_page() do_huge_pmd_numa_page() code clean up.
Remove unnecessary else branch to reduce code indentation.
Suggested-by "Huang, Ying" <[email protected]>
Signed-off-by Zi Yan <[email protected]>
--- mm/huge_memory.c | 13 ++++++------- mm/memory.c | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 17 deletions(-)
mm/huge_memory.c +6 -7
@@ -1719,15 +1719,14 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf) nid = target_nid;task_numa_fault (last_cpupid, nid,HPAGE_PMD_NR , flags);return 0 ; - }else { - flags |=TNF_MIGRATE_FAIL ; - vmf->ptl =pmd_lock (vma->vm_mm, vmf->pmd); -if (unlikely (!pmd_same (pmdp_get (vmf->pmd), vmf->orig_pmd))) { -spin_unlock (vmf->ptl); -return 0 ; - } } + flags |=TNF_MIGRATE_FAIL ; + vmf->ptl =pmd_lock (vma->vm_mm, vmf->pmd); +if (unlikely (!pmd_same (pmdp_get (vmf->pmd), vmf->orig_pmd))) { +spin_unlock (vmf->ptl); +return 0 ; + } out_map:/* Restore the PMD */ pmd =pmd_modify (pmdp_get (vmf->pmd), vma->vm_page_prot);
mm/memory.c +10 -10
@@ -5528,16 +5528,16 @@ static vm_fault_t do_numa_page(struct vm_fault *vmf) flags |=TNF_MIGRATED ;task_numa_fault (last_cpupid, nid, nr_pages, flags);return 0 ; - }else { - flags |=TNF_MIGRATE_FAIL ; - vmf->pte =pte_offset_map_lock (vma->vm_mm, vmf->pmd, - vmf->address, &vmf->ptl); -if (unlikely (!vmf->pte)) -return 0 ; -if (unlikely (!pte_same (ptep_get (vmf->pte), vmf->orig_pte))) { -pte_unmap_unlock (vmf->pte, vmf->ptl); -return 0 ; - } + } + + flags |=TNF_MIGRATE_FAIL ; + vmf->pte =pte_offset_map_lock (vma->vm_mm, vmf->pmd, + vmf->address, &vmf->ptl); +if (unlikely (!vmf->pte)) +return 0 ; +if (unlikely (!pte_same (ptep_get (vmf->pte), vmf->orig_pte))) { +pte_unmap_unlock (vmf->pte, vmf->ptl); +return 0 ; } out_map:/*
Signature · 1 line
2.43.0
Zi Yan
reviewerQuoted 5 lines · Zi Yan
Remove unnecessary else branch to reduce code indentation.
Suggested-by "Huang, Ying" <[email protected]>Signed-off-by Zi Yan <[email protected]>---
Please ignore this for now. I will send it with other patches.
Best Regards,
Yan, Zi