From: Dave Chinner <dchinner@xxxxxxxxxx> The test currently uses 'dd' directly for writing to files; instead we should be using the xfs_io pwrite command. Also, when we have a configuration that does not do delayed allocation (e.g. dax), there is no guarantee that the files will be allocated in the pattern expected, so do all the writes from a single buffer so the kernel can allocate extents in the manner the test expects as much as possible. Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> --- tests/generic/018 | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/tests/generic/018 b/tests/generic/018 index 2b804b5..fbefbe2 100755 --- a/tests/generic/018 +++ b/tests/generic/018 @@ -57,6 +57,7 @@ fragfile=$SCRATCH_MNT/fragfile.$$ rm -f $fragfile # Craft some fragmented files, defrag them, check the result. +bsize=4096 echo "zero-length file:" | tee -a $seqres.full touch $fragfile @@ -67,24 +68,28 @@ $XFS_IO_PROG -f -c "truncate 1m" $fragfile _defrag --before 0 --after 0 $fragfile echo "Contiguous file:" | tee -a $seqres.full -dd if=/dev/zero of=$fragfile bs=4k count=4 &>/dev/null +$XFS_IO_PROG -f -c "pwrite -b $((4 * bsize)) 0 $((4 * bsize))" $fragfile \ + > /dev/null _defrag --before 1 --after 1 $fragfile echo "Write backwards sync, but contiguous - should defrag to 1 extent" | tee -a $seqres.full -for I in `seq 9 -1 0`; do - dd if=/dev/zero of=$fragfile bs=4k count=1 conv=notrunc seek=$I oflag=sync &>/dev/null +for i in `seq 9 -1 0`; do + $XFS_IO_PROG -fs -c "pwrite $((i * bsize)) $bsize" $fragfile \ + > /dev/null done _defrag --before 10 --after 1 $fragfile echo "Write backwards sync leaving holes - defrag should do nothing" | tee -a $seqres.full -for I in `seq 31 -2 0`; do - dd if=/dev/zero of=$fragfile bs=4k count=1 conv=notrunc seek=$I oflag=sync &>/dev/null +for i in `seq 31 -2 0`; do + $XFS_IO_PROG -fs -c "pwrite $((i * bsize)) $bsize" $fragfile \ + > /dev/null done _defrag --before 16 --after 16 $fragfile echo "Write forwards sync leaving holes - defrag should do nothing" | tee -a $seqres.full -for I in `seq 0 2 31`; do - dd if=/dev/zero of=$fragfile bs=4k count=1 conv=notrunc seek=$I oflag=sync &>/dev/null +for i in `seq 0 2 31`; do + $XFS_IO_PROG -fs -c "pwrite $((i * bsize)) $bsize" $fragfile \ + > /dev/null done _defrag --before 16 --after 16 $fragfile -- 2.0.0 -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
