1 files changed, 4 insertions, 3 deletions

diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 93d5f87c00d5..566148489e33 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -891,9 +891,10 @@ static bool __collapse_huge_page_swapin(struct mm_struct *mm,
                 /* do_swap_page returns VM_FAULT_RETRY with released mmap_sem */
                 if (ret & VM_FAULT_RETRY) {
                         down_read(&mm->mmap_sem);
-                        /* vma is no longer available, don't continue to swapin */
-                        if (hugepage_vma_revalidate(mm, address))
+                        if (hugepage_vma_revalidate(mm, address)) {
+                                /* vma is no longer available, don't continue to swapin */
                                 return false;
+                        }
                         /* check if the pmd is still valid */
                         if (mm_find_pmd(mm, address) != pmd)
                                 return false;
@@ -969,7 +970,7 @@ static void collapse_huge_page(struct mm_struct *mm,
 
         /*
          * __collapse_huge_page_swapin always returns with mmap_sem locked.
-         * If it fails, release mmap_sem and jump directly out.
+         * If it fails, we release mmap_sem and jump out_nolock.
          * Continuing to collapse causes inconsistency.
          */
         if (!__collapse_huge_page_swapin(mm, vma, address, pmd)) {