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>
This commit is contained in:
committed by
Linus Torvalds
parent
fef792a4fd
commit
18d24a7cd9
@ -1128,10 +1128,10 @@ static void collapse_huge_page(struct mm_struct *mm,
|
|||||||
mmap_write_lock(mm);
|
mmap_write_lock(mm);
|
||||||
result = hugepage_vma_revalidate(mm, address, &vma);
|
result = hugepage_vma_revalidate(mm, address, &vma);
|
||||||
if (result)
|
if (result)
|
||||||
goto out;
|
goto out_up_write;
|
||||||
/* check if the pmd is still valid */
|
/* check if the pmd is still valid */
|
||||||
if (mm_find_pmd(mm, address) != pmd)
|
if (mm_find_pmd(mm, address) != pmd)
|
||||||
goto out;
|
goto out_up_write;
|
||||||
|
|
||||||
anon_vma_lock_write(vma->anon_vma);
|
anon_vma_lock_write(vma->anon_vma);
|
||||||
|
|
||||||
@ -1171,7 +1171,7 @@ static void collapse_huge_page(struct mm_struct *mm,
|
|||||||
spin_unlock(pmd_ptl);
|
spin_unlock(pmd_ptl);
|
||||||
anon_vma_unlock_write(vma->anon_vma);
|
anon_vma_unlock_write(vma->anon_vma);
|
||||||
result = SCAN_FAIL;
|
result = SCAN_FAIL;
|
||||||
goto out;
|
goto out_up_write;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -1215,8 +1215,6 @@ out_nolock:
|
|||||||
mem_cgroup_uncharge(*hpage);
|
mem_cgroup_uncharge(*hpage);
|
||||||
trace_mm_collapse_huge_page(mm, isolated, result);
|
trace_mm_collapse_huge_page(mm, isolated, result);
|
||||||
return;
|
return;
|
||||||
out:
|
|
||||||
goto out_up_write;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int khugepaged_scan_pmd(struct mm_struct *mm,
|
static int khugepaged_scan_pmd(struct mm_struct *mm,
|
||||||
|
Reference in New Issue
Block a user