mm, thp: fix comment inconsistency for swapin readahead functions
authorEbru Akagunduz <[email protected]>
Tue, 26 Jul 2016 22:26:43 +0000 (15:26 -0700)
committerLinus Torvalds <[email protected]>
Tue, 26 Jul 2016 23:19:19 +0000 (16:19 -0700)
After fixing swapin issues, comment lines stayed as in old version.
This patch updates the comments.

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ebru Akagunduz <[email protected]>
Acked-by: Rik van Riel <[email protected]>
Cc: Hugh Dickins <[email protected]>
Cc: Kirill A. Shutemov <[email protected]>
Cc: Naoya Horiguchi <[email protected]>
Cc: Andrea Arcangeli <[email protected]>
Cc: Joonsoo Kim <[email protected]>
Cc: Cyrill Gorcunov <[email protected]>
Cc: Mel Gorman <[email protected]>
Cc: David Rientjes <[email protected]>
Cc: Vlastimil Babka <[email protected]>
Cc: Aneesh Kumar K.V <[email protected]>
Cc: Johannes Weiner <[email protected]>
Cc: Michal Hocko <[email protected]>
Cc: Boaz Harrosh <[email protected]>
Cc: Hillf Danton <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
mm/khugepaged.c

index 93d5f87c00d57c392e43c8bd1c1e5b0df15ca0bc..566148489e338698eb81e379be7aa4d5789cb6c6 100644 (file)
@@ -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)) {