Fixed merge problems

033

@@ -1,5 +1,5 @@
 #! /bin/sh
-# XFS QA Test No. 033
+# FS QA Test No. 033
 #
 # exercise xfs_repair repairing broken filesystems (root inodes)
 #
@@ -47,8 +47,9 @@ status=1	# failure is the default!
 
 _cleanup()
 {
-	umount $SCRATCH_DEV 2>/dev/null
-	rm -f $tmp.*
+    cd /
+    umount $SCRATCH_DEV 2>/dev/null
+    rm -f $tmp.*
 }
 
 trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -58,6 +59,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 . ./common.repair
 
+# link correct .out file
+_link_out_file $seq.out
+
 # nuke the root, rt bitmap, and rt summary inodes
 # 
 _check_root_inos()
@@ -71,12 +75,15 @@ _check_root_inos()
 }
 
 # real QA test starts here
+_supported_fs xfs
+_supported_os IRIX Linux
+ 
 _require_nobigloopfs
 _require_scratch
 
 # devzero blows away 512byte blocks, so make 512byte inodes (at least)
 _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
-source $tmp.mkfs
+. $tmp.mkfs
 [ $isize -lt 512 ] && \
 	_scratch_mkfs_xfs -isize=512 | _filter_mkfs >/dev/null 2>&1