Passing 'vma' to hugepage_vma_revlidate() is useless. It doesn't make use of it anyway. Link: http://lkml.kernel.org/r/20160530095058.GA53044@xxxxxxxxxxxxxxxxxx Cc: Ebru Akagunduz <ebru.akagunduz@xxxxxxxxx> Cc: Hugh Dickins <hughd@xxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/huge_memory.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 96dfe3f09bf6..7bb30e853335 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2384,10 +2384,9 @@ static bool hugepage_vma_check(struct vm_area_struct *vma) * value (scan code). */ -static int hugepage_vma_revalidate(struct mm_struct *mm, - struct vm_area_struct *vma, - unsigned long address) +static int hugepage_vma_revalidate(struct mm_struct *mm, unsigned long address) { + struct vm_area_struct *vma; unsigned long hstart, hend; if (unlikely(khugepaged_test_exit(mm))) @@ -2436,7 +2435,7 @@ static bool __collapse_huge_page_swapin(struct mm_struct *mm, 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, vma, address)) + if (hugepage_vma_revalidate(mm, address)) return false; } if (ret & VM_FAULT_ERROR) { @@ -2487,7 +2486,7 @@ static void collapse_huge_page(struct mm_struct *mm, } down_read(&mm->mmap_sem); - result = hugepage_vma_revalidate(mm, vma, address); + result = hugepage_vma_revalidate(mm, address); if (result) goto out; @@ -2514,7 +2513,7 @@ static void collapse_huge_page(struct mm_struct *mm, * handled by the anon_vma lock + PG_lock. */ down_write(&mm->mmap_sem); - result = hugepage_vma_revalidate(mm, vma, address); + result = hugepage_vma_revalidate(mm, address); if (result) goto out; -- 2.8.1 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
