Various tests opencode checks to find out the minimum support direct I/O size. Replace those with a generic helper that handles network filesystems as well. Also remove the Linux 2.4 workaround we had in once place. Signed-off-by: Christoph Hellwig <hch@xxxxxx> diff --git a/common/rc b/common/rc index ea3af12..64139c8 100644 --- a/common/rc +++ b/common/rc @@ -2179,6 +2179,21 @@ _scale_fsstress_args() echo $args } +# +# Return the logical block size if running on a block device, +# else substitute the page size. +# +_min_dio_alignment() +{ + dev=$1 + + if [ -b "$dev" ]; then + blockdev --getss $dev + else + $here/src/feature -s + fi +} + run_check() { echo "# $@" >> $seqres.full 2>&1 diff --git a/tests/generic/091 b/tests/generic/091 index cee012d..d0f5800 100755 --- a/tests/generic/091 +++ b/tests/generic/091 @@ -54,11 +54,7 @@ run_fsx() } psize=`$here/src/feature -s` -bsize=`blockdev --getss $TEST_DEV` -kernel=`uname -r | sed -e 's/\(2\..\).*/\1/'` - -# 2.4 Linux kernels support bsize aligned direct I/O only -[ "$HOSTOS" = "Linux" -a "$kernel" = "2.4" ] && bsize=$psize +bsize=`_min_dio_alignment $TEST_DEV` # fsx usage: # diff --git a/tests/generic/240 b/tests/generic/240 index e692318..d3fd442 100755 --- a/tests/generic/240 +++ b/tests/generic/240 @@ -60,7 +60,7 @@ rm -f $seqres.full rm -f $TEST_DIR/aiodio_sparse -logical_block_size=`blockdev --getss $TEST_DEV` +logical_block_size=`_min_dio_alignment $TEST_DEV` fs_block_size=`stat -f $TEST_DIR | grep "Block size:" | awk '{print $3}'` if [ $fs_block_size -le $logical_block_size ]; then diff --git a/tests/generic/263 b/tests/generic/263 index 377b199..094c3d1 100755 --- a/tests/generic/263 +++ b/tests/generic/263 @@ -54,7 +54,7 @@ run_fsx() } psize=`$here/src/feature -s` -bsize=`blockdev --getss $TEST_DEV` +bsize=`_min_dio_alignment $TEST_DEV` run_fsx -N 10000 -o 8192 -l 500000 -r PSIZE -t BSIZE -w BSIZE -Z run_fsx -N 10000 -o 128000 -l 500000 -r PSIZE -t BSIZE -w BSIZE -Z _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs