generic: use xfs_io falloc, not fallocate

generic/315 fails messily if the fallocate command isn't present.

generic/299 also uses "fallocate" and "truncate" binaries which may
not be present.

Switch both to use xfs_io, and we already have the _require for
that, because it's what every other test uses...

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/tests/generic/299 b/tests/generic/299
index e8685a42c5b276aba727dd7e2cca1a1908a15160..e49eba90820dc4502f6a63acffdf1c9232f1d225 100755 (executable)
--- a/tests/generic/299
+++ b/tests/generic/299
@@ -110,6 +110,7 @@ filename=buffered-aio-verifier
 EOF
 
 _require_fio $fio_config
+_require_xfs_io_command "falloc"
 
 _workout()
 {
@@ -125,12 +126,13 @@ _workout()
        do
            for ((k=1; k <= NUM_JOBS; k++))
            do
-               fallocate -l $FILE_SIZE $SCRATCH_MNT/direct_aio.$k.0 \
-                       >> $seqres.full 2>&1
+               $XFS_IO_PROG -f -c "falloc 0 $FILE_SIZE" \
+                       $SCRATCH_MNT/direct_aio.$k.0 >> $seqres.full 2>&1
            done
            for ((k=1; k <= NUM_JOBS; k++))
            do
-               truncate -s 0 $SCRATCH_MNT/direct_aio.$k.0 >> $seqres.full 2>&1
+               $XFS_IO_PROG -c "truncate  0" \
+                       $SCRATCH_MNT/direct_aio.$k.0 >> $seqres.full 2>&1
            done
            # Following like will check that pid is still run.
            # Once fio exit we can stop fallocate/truncate loop

diff --git a/tests/generic/315 b/tests/generic/315
index 62fdc0116b794c7141e7b2e2d394edba58d53735..4433b6c1d7a02a2723fb25a806103ca7a1b60941 100755 (executable)
--- a/tests/generic/315
+++ b/tests/generic/315
@@ -49,6 +49,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 _require_test
+_require_xfs_io_command "falloc"
 
 rm -f $seqres.full
 
@@ -62,7 +63,8 @@ avail_begin=`df -P $TEST_DIR | awk 'END {print $4}'`
 # Preallocate half size of the available disk space to a file
 # starts from offset 0 with FALLOC_FL_KEEP_SIZE option on the
 # test file system.
-fallocate -n -o 0 -l $(($avail_begin/2)) $TEST_DIR/testfile.$seq >>$seqres.full 2>&1
+$XFS_IO_PROG -f -c 'falloc -k 0 $(($avail_begin/2))' \
+       $TEST_DIR/testfile.$seq >>$seqres.full 2>&1
 
 # Verify the file size, it should keep unchanged as 0 in this case
 fsize=`ls -l $TEST_DIR/testfile.$seq | awk '{print $5}'`