On 26/07/10 09:16PM, Lorenzo Stoakes wrote: > Now we have the vma_start_pgoff() helper, update the merge tests to make > use of it for consistency. > > No functional change intended. > > Reviewed-by: Pedro Falcato <[email protected]> > Reviewed-by: Gregory Price <[email protected]> > Reviewed-by: Vlastimil Babka (SUSE) <[email protected]> > Signed-off-by: Lorenzo Stoakes <[email protected]>
Reviewed-by: Liam R. Howlett (Oracle) <[email protected]> > --- > tools/testing/vma/tests/merge.c | 38 +++++++++++++++++++------------------- > 1 file changed, 19 insertions(+), 19 deletions(-) > > diff --git a/tools/testing/vma/tests/merge.c b/tools/testing/vma/tests/merge.c > index 03b6f9820e0a..f8666a755749 100644 > --- a/tools/testing/vma/tests/merge.c > +++ b/tools/testing/vma/tests/merge.c > @@ -118,7 +118,7 @@ static bool test_simple_merge(void) > > ASSERT_EQ(vma->vm_start, 0); > ASSERT_EQ(vma->vm_end, 0x3000); > - ASSERT_EQ(vma->vm_pgoff, 0); > + ASSERT_EQ(vma_start_pgoff(vma), 0); > ASSERT_FLAGS_SAME_MASK(&vma->flags, vma_flags); > > detach_free_vma(vma); > @@ -150,7 +150,7 @@ static bool test_simple_modify(void) > > ASSERT_EQ(vma->vm_start, 0x1000); > ASSERT_EQ(vma->vm_end, 0x2000); > - ASSERT_EQ(vma->vm_pgoff, 1); > + ASSERT_EQ(vma_start_pgoff(vma), 1); > > /* > * Now walk through the three split VMAs and make sure they are as > @@ -162,7 +162,7 @@ static bool test_simple_modify(void) > > ASSERT_EQ(vma->vm_start, 0); > ASSERT_EQ(vma->vm_end, 0x1000); > - ASSERT_EQ(vma->vm_pgoff, 0); > + ASSERT_EQ(vma_start_pgoff(vma), 0); > > detach_free_vma(vma); > vma_iter_clear(&vmi); > @@ -171,7 +171,7 @@ static bool test_simple_modify(void) > > ASSERT_EQ(vma->vm_start, 0x1000); > ASSERT_EQ(vma->vm_end, 0x2000); > - ASSERT_EQ(vma->vm_pgoff, 1); > + ASSERT_EQ(vma_start_pgoff(vma), 1); > > detach_free_vma(vma); > vma_iter_clear(&vmi); > @@ -180,7 +180,7 @@ static bool test_simple_modify(void) > > ASSERT_EQ(vma->vm_start, 0x2000); > ASSERT_EQ(vma->vm_end, 0x3000); > - ASSERT_EQ(vma->vm_pgoff, 2); > + ASSERT_EQ(vma_start_pgoff(vma), 2); > > detach_free_vma(vma); > mtree_destroy(&mm.mm_mt); > @@ -209,7 +209,7 @@ static bool test_simple_expand(void) > > ASSERT_EQ(vma->vm_start, 0); > ASSERT_EQ(vma->vm_end, 0x3000); > - ASSERT_EQ(vma->vm_pgoff, 0); > + ASSERT_EQ(vma_start_pgoff(vma), 0); > > detach_free_vma(vma); > mtree_destroy(&mm.mm_mt); > @@ -231,7 +231,7 @@ static bool test_simple_shrink(void) > > ASSERT_EQ(vma->vm_start, 0); > ASSERT_EQ(vma->vm_end, 0x1000); > - ASSERT_EQ(vma->vm_pgoff, 0); > + ASSERT_EQ(vma_start_pgoff(vma), 0); > > detach_free_vma(vma); > mtree_destroy(&mm.mm_mt); > @@ -324,7 +324,7 @@ static bool __test_merge_new(bool is_sticky, bool > a_is_sticky, bool b_is_sticky, > ASSERT_TRUE(merged); > ASSERT_EQ(vma->vm_start, 0); > ASSERT_EQ(vma->vm_end, 0x4000); > - ASSERT_EQ(vma->vm_pgoff, 0); > + ASSERT_EQ(vma_start_pgoff(vma), 0); > ASSERT_EQ(vma->anon_vma, &dummy_anon_vma); > ASSERT_TRUE(vma_write_started(vma)); > ASSERT_EQ(mm.map_count, 3); > @@ -343,7 +343,7 @@ static bool __test_merge_new(bool is_sticky, bool > a_is_sticky, bool b_is_sticky, > ASSERT_TRUE(merged); > ASSERT_EQ(vma->vm_start, 0); > ASSERT_EQ(vma->vm_end, 0x5000); > - ASSERT_EQ(vma->vm_pgoff, 0); > + ASSERT_EQ(vma_start_pgoff(vma), 0); > ASSERT_EQ(vma->anon_vma, &dummy_anon_vma); > ASSERT_TRUE(vma_write_started(vma)); > ASSERT_EQ(mm.map_count, 3); > @@ -364,7 +364,7 @@ static bool __test_merge_new(bool is_sticky, bool > a_is_sticky, bool b_is_sticky, > ASSERT_TRUE(merged); > ASSERT_EQ(vma->vm_start, 0x6000); > ASSERT_EQ(vma->vm_end, 0x9000); > - ASSERT_EQ(vma->vm_pgoff, 6); > + ASSERT_EQ(vma_start_pgoff(vma), 6); > ASSERT_EQ(vma->anon_vma, &dummy_anon_vma); > ASSERT_TRUE(vma_write_started(vma)); > ASSERT_EQ(mm.map_count, 3); > @@ -384,7 +384,7 @@ static bool __test_merge_new(bool is_sticky, bool > a_is_sticky, bool b_is_sticky, > ASSERT_TRUE(merged); > ASSERT_EQ(vma->vm_start, 0); > ASSERT_EQ(vma->vm_end, 0x9000); > - ASSERT_EQ(vma->vm_pgoff, 0); > + ASSERT_EQ(vma_start_pgoff(vma), 0); > ASSERT_EQ(vma->anon_vma, &dummy_anon_vma); > ASSERT_TRUE(vma_write_started(vma)); > ASSERT_EQ(mm.map_count, 2); > @@ -404,7 +404,7 @@ static bool __test_merge_new(bool is_sticky, bool > a_is_sticky, bool b_is_sticky, > ASSERT_TRUE(merged); > ASSERT_EQ(vma->vm_start, 0xa000); > ASSERT_EQ(vma->vm_end, 0xc000); > - ASSERT_EQ(vma->vm_pgoff, 0xa); > + ASSERT_EQ(vma_start_pgoff(vma), 0xa); > ASSERT_EQ(vma->anon_vma, &dummy_anon_vma); > ASSERT_TRUE(vma_write_started(vma)); > ASSERT_EQ(mm.map_count, 2); > @@ -423,7 +423,7 @@ static bool __test_merge_new(bool is_sticky, bool > a_is_sticky, bool b_is_sticky, > ASSERT_TRUE(merged); > ASSERT_EQ(vma->vm_start, 0); > ASSERT_EQ(vma->vm_end, 0xc000); > - ASSERT_EQ(vma->vm_pgoff, 0); > + ASSERT_EQ(vma_start_pgoff(vma), 0); > ASSERT_EQ(vma->anon_vma, &dummy_anon_vma); > ASSERT_TRUE(vma_write_started(vma)); > ASSERT_EQ(mm.map_count, 1); > @@ -443,7 +443,7 @@ static bool __test_merge_new(bool is_sticky, bool > a_is_sticky, bool b_is_sticky, > ASSERT_NE(vma, NULL); > ASSERT_EQ(vma->vm_start, 0); > ASSERT_EQ(vma->vm_end, 0xc000); > - ASSERT_EQ(vma->vm_pgoff, 0); > + ASSERT_EQ(vma_start_pgoff(vma), 0); > ASSERT_EQ(vma->anon_vma, &dummy_anon_vma); > > detach_free_vma(vma); > @@ -805,7 +805,7 @@ static bool test_vma_merge_new_with_close(void) > ASSERT_EQ(vmg.state, VMA_MERGE_SUCCESS); > ASSERT_EQ(vma->vm_start, 0); > ASSERT_EQ(vma->vm_end, 0x5000); > - ASSERT_EQ(vma->vm_pgoff, 0); > + ASSERT_EQ(vma_start_pgoff(vma), 0); > ASSERT_EQ(vma->vm_ops, &vm_ops); > ASSERT_TRUE(vma_write_started(vma)); > ASSERT_EQ(mm.map_count, 2); > @@ -865,7 +865,7 @@ static bool __test_merge_existing(bool prev_is_sticky, > bool middle_is_sticky, bo > ASSERT_EQ(vma_next->anon_vma, &dummy_anon_vma); > ASSERT_EQ(vma->vm_start, 0x2000); > ASSERT_EQ(vma->vm_end, 0x3000); > - ASSERT_EQ(vma->vm_pgoff, 2); > + ASSERT_EQ(vma_start_pgoff(vma), 2); > ASSERT_TRUE(vma_write_started(vma)); > ASSERT_TRUE(vma_write_started(vma_next)); > ASSERT_EQ(mm.map_count, 2); > @@ -931,7 +931,7 @@ static bool __test_merge_existing(bool prev_is_sticky, > bool middle_is_sticky, bo > ASSERT_EQ(vma_prev->anon_vma, &dummy_anon_vma); > ASSERT_EQ(vma->vm_start, 0x6000); > ASSERT_EQ(vma->vm_end, 0x7000); > - ASSERT_EQ(vma->vm_pgoff, 6); > + ASSERT_EQ(vma_start_pgoff(vma), 6); > ASSERT_TRUE(vma_write_started(vma_prev)); > ASSERT_TRUE(vma_write_started(vma)); > ASSERT_EQ(mm.map_count, 2); > @@ -1416,7 +1416,7 @@ static bool test_merge_extend(void) > ASSERT_EQ(vma_merge_extend(&vmi, vma, 0x2000), vma); > ASSERT_EQ(vma->vm_start, 0); > ASSERT_EQ(vma->vm_end, 0x4000); > - ASSERT_EQ(vma->vm_pgoff, 0); > + ASSERT_EQ(vma_start_pgoff(vma), 0); > ASSERT_TRUE(vma_write_started(vma)); > ASSERT_EQ(mm.map_count, 1); > > @@ -1456,7 +1456,7 @@ static bool test_expand_only_mode(void) > ASSERT_EQ(vmg.state, VMA_MERGE_SUCCESS); > ASSERT_EQ(vma->vm_start, 0x3000); > ASSERT_EQ(vma->vm_end, 0x9000); > - ASSERT_EQ(vma->vm_pgoff, 3); > + ASSERT_EQ(vma_start_pgoff(vma), 3); > ASSERT_TRUE(vma_write_started(vma)); > ASSERT_EQ(vma_iter_addr(&vmi), 0x3000); > vma_assert_attached(vma); > > -- > 2.55.0 >
