Fixed merge problems

054

@@ -1,5 +1,5 @@
 #! /bin/sh
-# XFS QA Test No. 054
+# FS QA Test No. 054
 #
 # Check behavior of chown with both user and group quota enabled,
 # and changing both user and group together via chown(2).
@@ -57,6 +57,11 @@ _cleanup()
 	rm -f $tmp.*
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
+
+# real QA test starts here
+_supported_fs xfs
+_supported_os Linux
+
 cp /dev/null $seq.full
 chmod ugo+rwx $seq.full
 
@@ -108,7 +113,6 @@ _exercise()
 	umount $SCRATCH_MNT 2>/dev/null
 }
 
-# real QA test starts here
 _scratch_mkfs_xfs $SCRATCH_DEV >/dev/null 2>&1
 MOUNT_OPTIONS="$MOUNT_OPTIONS -ousrquota,grpquota"; export MOUNT_OPTIONS
 _qmount