xfs/538: fix fsstress scaling

_scale_fsstress_args() does time/load scaling of parameters. Doing
it also in the test causes exponential scaling instead of linear
scaling as the time/load parameters are meant to do.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/tests/xfs/538 b/tests/xfs/538
index e0102f48528d4795abdcda7ed9456499c54c587d..2b5e97e581d2244c258723310d4a0a5925746036 100755 (executable)
--- a/tests/xfs/538
+++ b/tests/xfs/538
@@ -47,25 +47,23 @@ done
 echo "Inject bmap_alloc_minlen_extent error tag"
 _scratch_inject_error bmap_alloc_minlen_extent 1
 
-echo "Scale fsstress args"
-args=$(_scale_fsstress_args -p $((LOAD_FACTOR * 75)) -n $((TIME_FACTOR * 1000)))
-
-echo "Execute fsstress in background"
-$FSSTRESS_PROG -d $SCRATCH_MNT $args \
-                -f bulkstat=0 \
-                -f bulkstat1=0 \
-                -f fiemap=0 \
-                -f getattr=0 \
-                -f getdents=0 \
-                -f getfattr=0 \
-                -f listfattr=0 \
-                -f mread=0 \
-                -f read=0 \
-                -f readlink=0 \
-                -f readv=0 \
-                -f stat=0 \
-                -f aread=0 \
-                -f dread=0 > /dev/null 2>&1
+echo "Execute fsstress"
+$FSSTRESS_PROG -d $SCRATCH_MNT \
+               $(_scale_fsstress_args -p 75 -n 1000) \
+               -f bulkstat=0 \
+               -f bulkstat1=0 \
+               -f fiemap=0 \
+               -f getattr=0 \
+               -f getdents=0 \
+               -f getfattr=0 \
+               -f listfattr=0 \
+               -f mread=0 \
+               -f read=0 \
+               -f readlink=0 \
+               -f readv=0 \
+               -f stat=0 \
+               -f aread=0 \
+               -f dread=0 > /dev/null 2>&1
 
 # success, all done
 status=0

diff --git a/tests/xfs/538.out b/tests/xfs/538.out
index 85932c82634a00839e234991e41d9eabdb27c3fc..97ebc314e2e4d64150ad4f627b7f0e1f88e93686 100644 (file)
--- a/tests/xfs/538.out
+++ b/tests/xfs/538.out
@@ -3,5 +3,4 @@ Format and mount fs
 Consume free space
 Create fragmented filesystem
 Inject bmap_alloc_minlen_extent error tag
-Scale fsstress args
-Execute fsstress in background
+Execute fsstress