Fixed merge problems

017

@@ -1,5 +1,5 @@
 #! /bin/sh
-# XFS QA Test No. 017
+# FS QA Test No. 017
 #
 # test remount ro - pv 795642 
 #
@@ -44,19 +44,21 @@ echo "QA output created by $seq"
 here=`pwd`
 tmp=/tmp/$$
 status=1
+trap "_cleanup; rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 _cleanup()
 {
     echo "*** unmount"
     umount $SCRATCH_MNT 2>/dev/null
 }
-trap "_cleanup; rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
 . ./common.rc
 . ./common.filter
 
 # real QA test starts here
+_supported_fs xfs
+_supported_os Linux
 
 _require_scratch