hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mm, thp: fix comment inconsistency for swapin readahead functions 

After fixing swapin issues, comment lines stayed as in old version.
This patch updates the comments.

Link: http://lkml.kernel.org/r/1468109345-32258-1-git-send-email-ebru.akagunduz@gmail.com
Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Acked-by: Rik van Riel <riel@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: David Rientjes <rientjes@google.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Boaz Harrosh <boaz@plexistor.com>
Cc: Hillf Danton <hillf.zj@alibaba-inc.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ebru Akagunduz 2016-07-26 15:26:43 -07:00 committed by Linus Torvalds
parent 1b5946a84d
commit 47f863ea22
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mm/khugepaged.c
View 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 */ /* do_swap_page returns VM_FAULT_RETRY with released mmap_sem */
if (ret & VM_FAULT_RETRY) { if (ret & VM_FAULT_RETRY) {
down_read(&mm->mmap_sem); 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; return false;
}
/* 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)
return false; 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. * __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. * Continuing to collapse causes inconsistency.
*/ */
if (!__collapse_huge_page_swapin(mm, vma, address, pmd)) { if (!__collapse_huge_page_swapin(mm, vma, address, pmd)) {