Fixed merge problems

080

@@ -1,5 +1,5 @@
 #! /bin/sh
-# XFS QA Test No. 080
+# FS QA Test No. 080
 #
 # rwtest (iogen|doio)
 #
@@ -44,17 +44,29 @@ echo "QA output created by $seq"
 here=`pwd`
 tmp=/tmp/$$
 status=1	# failure is the default!
-trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
+trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
 . ./common.rc
 . ./common.filter
 
+_cleanup()
+{ 
+    cd /
+    rm -f $tmp.*
+   _cleanup_testdir
+}
+
+_supported_fs xfs
+_supported_os IRIX Linux
+
+_setup_testdir
+
 quiet=-q
 clean=-c
 
 export here
-cd $TEST_DIR
+cd $testdir
 echo
 
 # real QA test starts here