Fixed merge problems

049

@@ -1,5 +1,5 @@
 #! /bin/sh
-# XFS QA Test No. 049
+# FS QA Test No. 049
 #
 # XFS on loop test
 #
@@ -43,6 +43,7 @@ echo "QA output created by $seq"
 
 _cleanup()
 {
+    cd /
     umount $SCRATCH_MNT/test2 > /dev/null 2>&1
     umount $SCRATCH_MNT/test > /dev/null 2>&1
     rm -f $tmp.*
@@ -63,6 +64,10 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
+# real QA test starts here
+_supported_fs xfs
+_supported_os Linux
+
 _log()
 {
     echo "--- $*"
@@ -74,9 +79,6 @@ _require_nonexternal
 _require_scratch
 _require_loop
 
-
-# real QA test starts here
-
 rm -f $seq.full
 
 echo "(dev=$SCRATCH_DEV, mount=$SCRATCH_MNT)" >> $seq.full