diff options
| author | Miaohe Lin <linmiaohe@huawei.com> | 2021-05-05 03:34:17 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-05 20:27:21 +0200 |
| commit | 18d24a7cd9d3f35cfa8bed32a921a94159c78df0 (patch) | |
| tree | 77d527d7e9d46494742ff772a47e22aa6eef146e | |
| parent | khugepaged: use helper function range_in_vma() in collapse_pte_mapped_thp() (diff) | |
| download | linux-18d24a7cd9d3f35cfa8bed32a921a94159c78df0.tar.xz linux-18d24a7cd9d3f35cfa8bed32a921a94159c78df0.zip | |
khugepaged: remove unnecessary out label in collapse_huge_page()
The out label here is unneeded because it just goes to out_up_write label.
Remove it to make code more concise.
Link: https://lkml.kernel.org/r/20210325135647.64106-3-linmiaohe@huawei.com
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Reviewed-by: Zi Yan <ziy@nvidia.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | mm/khugepaged.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mm/khugepaged.c b/mm/khugepaged.c index beaf06123b4b..276ac0099e19 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1128,10 +1128,10 @@ static void collapse_huge_page(struct mm_struct *mm, mmap_write_lock(mm); result = hugepage_vma_revalidate(mm, address, &vma); if (result) - goto out; + goto out_up_write; /* check if the pmd is still valid */ if (mm_find_pmd(mm, address) != pmd) - goto out; + goto out_up_write; anon_vma_lock_write(vma->anon_vma); @@ -1171,7 +1171,7 @@ static void collapse_huge_page(struct mm_struct *mm, spin_unlock(pmd_ptl); anon_vma_unlock_write(vma->anon_vma); result = SCAN_FAIL; - goto out; + goto out_up_write; } /* @@ -1215,8 +1215,6 @@ out_nolock: mem_cgroup_uncharge(*hpage); trace_mm_collapse_huge_page(mm, isolated, result); return; -out: - goto out_up_write; } static int khugepaged_scan_pmd(struct mm_struct *mm, |