common/fuzzy: if the fuzz verb is random, keep fuzzing until we get a new value

[xfstests-dev.git] / common / filestreams

diff --git a/common/filestreams b/common/filestreams
index b3aee27099928c44a1d7e0c89a516f2fcaea6bf6..f5441f5a82e908b94096d277cc27e3d508df90bf 100644 (file)
--- a/common/filestreams
+++ b/common/filestreams
@@ -21,35 +21,12 @@
 
 _check_filestreams_support()
 {
-       local irix_timeout_sysvar="xfs_mfstream_timeout"
-       local linux_timeout_procvar="/proc/sys/fs/xfs/filestream_centisecs"
-       local streams_avail=""
-       if [ "$HOSTOS" == "IRIX" ]; then
-               # check for the filestreams timeout systune variable in irix
-               streams_avail=`systune $irix_timeout_sysvar 2>&1 |
-                       perl -ne 'if (/'$irix_timeout_sysvar'\s+=\s+\d+/) {print "true"}'`
-       else
-               # check for the filestreams timeout proc entry in linux
-               [ -f $linux_timeout_procvar ] && streams_avail="true"
-       fi
-
-       if [ "$streams_avail" == "true" ]; then
-               return 0
-       else
-               return 1
-       fi
+       [ -f /proc/sys/fs/xfs/filestream_centisecs ]
 }
 
 _set_stream_timeout_centisecs()
 {
-       local new_timeout_csecs=$1
-       local irix_timeout_sysvar="xfs_mfstream_timeout"
-       local linux_timeout_procvar="/proc/sys/fs/xfs/filestream_centisecs"
-       if [ "$HOSTOS" == "IRIX" ]; then
-               echo y | systune -r $irix_timeout_sysvar $new_timeout_csecs >/dev/null
-       else
-               echo $new_timeout_csecs > $linux_timeout_procvar
-       fi
+       echo $1 > /proc/sys/fs/xfs/filestream_centisecs
 }
 
 _do_stream()
@@ -63,22 +40,14 @@ _do_stream()
        local blocks_in_file=`expr $file_size / $bsize`
 
        mkdir $directory_name
-       if [ "$iflag" = "1" -a "$HOSTOS" != "IRIX" ]; then
+       if [ "$iflag" = "1" ]; then
                $XFS_IO_PROG -x -c "chattr +S" $directory_name \
                        || _fail "chattr of filestream flag"
        fi
        cd $directory_name
 
-       local dd_cmd=""
-       if [ "$HOSTOS" == "IRIX" ]; then
-               # for irix use lmdd
-               dd_cmd="lmdd"
-               [ "$dio" = "1" ] && dd_cmd="$dd_cmd odirect=1"
-       else
-               # for linux use dd
-               dd_cmd="dd"
-               [ "$dio" = "1" ] && dd_cmd="$dd_cmd oflag=direct"
-       fi
+       local dd_cmd="dd"
+       [ "$dio" = "1" ] && dd_cmd="$dd_cmd oflag=direct"
        dd_cmd="$dd_cmd if=/dev/zero bs=${bsize} count=${blocks_in_file}"
 
        local i=1
@@ -116,7 +85,7 @@ _check_for_dupes()
                 for this_num_two in $num_str_two; do
                         if [ "$this_num_one" == "$this_num_two" ]; then
                                echo "duplicate AG $this_num_one found" \
-                                       >> $RESULT_DIR/$seq.full
+                                       >> $seqres.full
                                return 1
                        fi
                 done
@@ -140,7 +109,7 @@ _test_streams() {
        _scratch_mkfs_xfs -dsize=$size,agcount=$agcount >/dev/null 2>&1 \
                || _fail "mkfs failed"
 
-       if [ "$use_iflag" = "0" -o "$HOSTOS" == "IRIX" ]; then
+       if [ "$use_iflag" = "0" ]; then
                # mount using filestreams mount option
                _scratch_mount "-o filestreams" \
                        || _fail "filestreams mount failed"
@@ -189,7 +158,7 @@ _test_streams() {
        stream_index=1
        while [ $stream_index -le $stream_count ]; do
                this_stream_ags=`_get_stream_ags stream${stream_index}-dir`
-               echo "stream $stream_index AGs: $this_stream_ags" >> $RESULT_DIR/$seq.full
+               echo "stream $stream_index AGs: $this_stream_ags" >> $seqres.full
                _check_for_dupes "$ags_seen" "$this_stream_ags"
                if [ $? -ne 0 ]; then
                        # this stream is not in seperate AGs to previous streams
@@ -225,5 +194,5 @@ _cleanup_streams_umount()
 {
        cd /
        rm -rf ${SCRATCH_MNT}/stream*
-       umount $SCRATCH_DEV 2>/dev/null
+       _scratch_unmount 2>/dev/null
 }