From: Miaohe Lin <linmiaohe@huawei.com>
Date: Wed, 24 Feb 2021 20:09:47 +0000 (-0800)
Subject: mm/mempolicy: use helper range_in_vma() in queue_pages_test_walk()
X-Git-Tag: v5.12-rc1~40^2~12
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ce33135cdee6e2c2874e9d1198a6df0c5f356080;p=linux-block.git

mm/mempolicy: use helper range_in_vma() in queue_pages_test_walk()

The helper range_in_vma() is introduced via commit 017b1660df89 ("mm:
migration: fix migration of huge PMD shared pages"). But we forgot to
use it in queue_pages_test_walk().

Link: https://lkml.kernel.org/r/20210130091352.20220-1-linmiaohe@huawei.com
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 6961238c7ef5..ab51132547b8 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -677,7 +677,7 @@ static int queue_pages_test_walk(unsigned long start, unsigned long end,
 	unsigned long flags = qp->flags;
 
 	/* range check first */
-	VM_BUG_ON_VMA((vma->vm_start > start) || (vma->vm_end < end), vma);
+	VM_BUG_ON_VMA(!range_in_vma(vma, start, end), vma);
 
 	if (!qp->first) {
 		qp->first = vma;