Fixed merge problems

018

@@ -1,5 +1,5 @@
 #! /bin/sh
-# XFS QA Test No. 018
+# FS QA Test No. 018
 #
 # xfs_logprint test - test v2 logs of different LR sizes
 #
@@ -52,6 +52,7 @@ status=1	# failure is the default!
 
 _cleanup()
 {
+    cd /
     _cleanup_logfiles
     rm -f $tmp.*
     echo "*** unmount"
@@ -60,10 +61,12 @@ _cleanup()
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # real QA test starts here
-
+_supported_fs xfs
+_supported_os IRIX Linux
 # prelim
 rm -f $seq.full $tmp.*
 _require_scratch
+
 echo "*** init FS"
 umount $SCRATCH_DEV >/dev/null 2>&1
 
@@ -86,6 +89,7 @@ do
     fi
     export MKFS_OPTIONS=$mkfs
     export MOUNT_OPTIONS=$mnt
+
     _mkfs_log
     _create_log
     _check_log