diff options
author | Darrick J. Wong <djwong@kernel.org> | 2023-05-02 13:08:28 -0700 |
---|---|---|
committer | Zorro Lang <zlang@kernel.org> | 2023-05-14 21:51:27 +0800 |
commit | 715d052a8fafc049944d3e295d5b53177b184a22 (patch) | |
tree | a7419e36d87c8260b145fb70bbb13680dc0eff20 | |
parent | 23e11f53b4b633947b42867c02fd8e943012389a (diff) | |
download | xfstests-dev-715d052a8fafc049944d3e295d5b53177b184a22.tar.gz |
xfs/{243,245,272,274}: ignore raid alignment flags in bmap output
This test doesn't care about the RAID alignment status of the mappings
that it finds; it only cares about shared and unwritten. Ignore the
mapping stripe alignment flags in the bmapx output. This fixes this
test when the fs has su=128k,sw=4.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Zorro Lang <zlang@kernel.org>
-rwxr-xr-x | tests/xfs/243 | 12 | ||||
-rwxr-xr-x | tests/xfs/245 | 6 | ||||
-rwxr-xr-x | tests/xfs/272 | 4 | ||||
-rwxr-xr-x | tests/xfs/274 | 8 |
4 files changed, 15 insertions, 15 deletions
diff --git a/tests/xfs/243 b/tests/xfs/243 index 514fa35667..2e537f3f55 100755 --- a/tests/xfs/243 +++ b/tests/xfs/243 @@ -92,16 +92,16 @@ echo "Delayed allocation CoW extents:" test $(_xfs_bmapx_find cow $testdir/file3 delalloc) -gt 0 || \ echo "Expected to find a delalloc CoW extent" echo "Shared data extents:" -test $(_xfs_bmapx_find data $testdir/file3 '100000$') -gt 0 || \ +test $(_xfs_bmapx_find data $testdir/file3 -E '10[01]{4}$') -gt 0 || \ echo "Expected to find a shared data extent" echo "Unwritten data extents:" -test $(_xfs_bmapx_find data $testdir/file3 '10000$') -gt 0 || \ +test $(_xfs_bmapx_find data $testdir/file3 -E '1[01]{4}$') -gt 0 || \ echo "Expected to find an unwritten data extent" echo "Hole data extents:" test $(_xfs_bmapx_find data $testdir/file3 hole) -gt 0 || \ echo "Expected to find a hole data extent" echo "Regular data extents:" -test $(_xfs_bmapx_find data $testdir/file3 '000000$') -gt 0 || \ +test $(_xfs_bmapx_find data $testdir/file3 -E '00[01]{4}$') -gt 0 || \ echo "Expected to find a regular data extent" sync @@ -115,16 +115,16 @@ echo "Real CoW extents:" test $(_xfs_bmapx_find cow $testdir/file3 delalloc ) -eq 0 || \ echo "Expected to find zero delalloc CoW extent" echo "Shared data extents:" -test $(_xfs_bmapx_find data $testdir/file3 '100000$') -gt 0 || \ +test $(_xfs_bmapx_find data $testdir/file3 -E '10[01]{4}$') -gt 0 || \ echo "Expected to find a shared data extent" echo "Unwritten data extents:" -test $(_xfs_bmapx_find data $testdir/file3 '10000$') -gt 0 || \ +test $(_xfs_bmapx_find data $testdir/file3 -E '1[01]{4}$') -gt 0 || \ echo "Expected to find an unwritten data extent" echo "Hole data extents:" test $(_xfs_bmapx_find data $testdir/file3 hole) -gt 0 || \ echo "Expected to find a hole data extent" echo "Regular data extents:" -test $(_xfs_bmapx_find data $testdir/file3 '000000$') -gt 0 || \ +test $(_xfs_bmapx_find data $testdir/file3 -E '00[01]{4}$') -gt 0 || \ echo "Expected to find a regular data extent" _scratch_cycle_mount diff --git a/tests/xfs/245 b/tests/xfs/245 index 0cd0935cfa..595a5938b4 100755 --- a/tests/xfs/245 +++ b/tests/xfs/245 @@ -42,17 +42,17 @@ md5sum $testdir/file1 | _filter_scratch md5sum $testdir/file2 | _filter_scratch echo "Unwritten data extents" -test $(_xfs_bmapx_find data $testdir/file1 '10000$') -gt 0 || \ +test $(_xfs_bmapx_find data $testdir/file1 -E '1[01]{4}$') -gt 0 || \ echo "Expected to find an unwritten file1 extent" echo "Shared data extents" -test $(_xfs_bmapx_find data $testdir/file1 '100000$') -gt 0 || \ +test $(_xfs_bmapx_find data $testdir/file1 -E '10[01]{4}$') -gt 0 || \ echo "Expected to find a shared data extent" echo "Hole data extents" test $(_xfs_bmapx_find data $testdir/file2 'hole') -gt 0 || \ echo "Expected to find a hole data extent" echo "Shared data extents" -test $(_xfs_bmapx_find data $testdir/file2 '100000$') -gt 0 || \ +test $(_xfs_bmapx_find data $testdir/file2 -E '10[01]{4}$') -gt 0 || \ echo "Expected to find a shared data extent" echo "Hole cow extents" diff --git a/tests/xfs/272 b/tests/xfs/272 index 7ed8b95122..c68fa9d614 100755 --- a/tests/xfs/272 +++ b/tests/xfs/272 @@ -49,10 +49,10 @@ $XFS_IO_PROG -c 'bmap -v' $SCRATCH_MNT/urk | grep '^[[:space:]]*[0-9]*:' | grep echo "Check bmap and fsmap" | tee -a $seqres.full cat $TEST_DIR/bmap | while read ext offrange colon blockrange ag agrange total crap; do - qstr="^[[:space:]]*[0-9]*:[[:space:]]*[0-9]*:[0-9]*[[:space:]]*${blockrange} :[[:space:]]*${ino}[[:space:]]*${offrange}[[:space:]]*${ag}[[:space:]]*${agrange}[[:space:]]*${total}$" + qstr="^[[:space:]]*[0-9]*:[[:space:]]*[0-9]*:[0-9]*[[:space:]]*${blockrange} :[[:space:]]*${ino}[[:space:]]*${offrange}[[:space:]]*${ag}[[:space:]]*${agrange}[[:space:]]*${total}(| [01]*)$" echo "${qstr}" >> $seqres.full grep "${qstr}" $TEST_DIR/fsmap >> $seqres.full - found=$(grep -c "${qstr}" $TEST_DIR/fsmap) + found=$(grep -E -c "${qstr}" $TEST_DIR/fsmap) test $found -eq 1 || echo "Unexpected output for offset ${offrange}." done diff --git a/tests/xfs/274 b/tests/xfs/274 index dcaea68804..cd483d77bc 100755 --- a/tests/xfs/274 +++ b/tests/xfs/274 @@ -49,10 +49,10 @@ $XFS_IO_PROG -c 'bmap -v' $SCRATCH_MNT/f1 | grep '^[[:space:]]*[0-9]*:' | grep - echo "Check f1 bmap and fsmap" | tee -a $seqres.full cat $TEST_DIR/bmap | while read ext offrange colon blockrange ag agrange total crap; do - qstr="^[[:space:]]*[0-9]*:[[:space:]]*[0-9]*:[0-9]*[[:space:]]*${blockrange} :[[:space:]]*${ino}[[:space:]]*${offrange}[[:space:]]*${ag}[[:space:]]*${agrange}[[:space:]]*${total} 0100000$" + qstr="^[[:space:]]*[0-9]*:[[:space:]]*[0-9]*:[0-9]*[[:space:]]*${blockrange} :[[:space:]]*${ino}[[:space:]]*${offrange}[[:space:]]*${ag}[[:space:]]*${agrange}[[:space:]]*${total} 010[01]{4}$" echo "${qstr}" >> $seqres.full grep "${qstr}" $TEST_DIR/fsmap >> $seqres.full - found=$(grep -c "${qstr}" $TEST_DIR/fsmap) + found=$(grep -E -c "${qstr}" $TEST_DIR/fsmap) test $found -eq 1 || echo "Unexpected output for offset ${offrange}." done @@ -62,10 +62,10 @@ $XFS_IO_PROG -c 'bmap -v' $SCRATCH_MNT/f2 | grep '^[[:space:]]*[0-9]*:' | grep - echo "Check f2 bmap and fsmap" | tee -a $seqres.full cat $TEST_DIR/bmap | while read ext offrange colon blockrange ag agrange total crap; do - qstr="^[[:space:]]*[0-9]*:[[:space:]]*[0-9]*:[0-9]*[[:space:]]*${blockrange} :[[:space:]]*${ino}[[:space:]]*${offrange}[[:space:]]*${ag}[[:space:]]*${agrange}[[:space:]]*${total} 0100000$" + qstr="^[[:space:]]*[0-9]*:[[:space:]]*[0-9]*:[0-9]*[[:space:]]*${blockrange} :[[:space:]]*${ino}[[:space:]]*${offrange}[[:space:]]*${ag}[[:space:]]*${agrange}[[:space:]]*${total} 010[01]{4}$" echo "${qstr}" >> $seqres.full grep "${qstr}" $TEST_DIR/fsmap >> $seqres.full - found=$(grep -c "${qstr}" $TEST_DIR/fsmap) + found=$(grep -E -c "${qstr}" $TEST_DIR/fsmap) test $found -eq 1 || echo "Unexpected output for offset ${offrange}." done |