Fixed merge problems

002

@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# XFS QA Test No. 002
+# FS QA Test No. 002
 #
 # simple inode link count test for a regular file
 #
@@ -49,38 +49,48 @@ echo "QA output created by $seq"
 tmp=/tmp/$$
 here=`pwd`
 status=0	# success is the default!
-trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+    rm -f $tmp.*
+    _cleanup_testdir
+}
 
 # real QA test starts here
+_supported_fs xfs udf nfs
+_supported_os IRIX Linux
+
+_setup_testdir
 
 echo "Silence is goodness ..."
 
 # ensure target directory exists
-mkdir `dirname $TEST_DIR/$tmp` 2>/dev/null
+mkdir `dirname $testdir/$tmp` 2>/dev/null
 
-touch $TEST_DIR/$tmp.1
+touch $testdir/$tmp.1
 for l in 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
 do
-    ln $TEST_DIR/$tmp.1 $TEST_DIR/$tmp.$l
-    x=`src/lstat64 $TEST_DIR/$tmp.1 | sed -n -e '/ Links: /s/.*Links: *//p'`
+    ln $testdir/$tmp.1 $testdir/$tmp.$l
+    x=`src/lstat64 $testdir/$tmp.1 | sed -n -e '/ Links: /s/.*Links: *//p'`
     if [ "$l" -ne $x ]
     then
 	echo "Arrgh, created link #$l and lstat64 looks like ..."
-	src/lstat64 $TEST_DIR/$tmp.1
+	src/lstat64 $testdir/$tmp.1
 	status=1
     fi
 done
 
 for l in 20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1
 do
-    x=`src/lstat64 $TEST_DIR/$tmp.1 | sed -n -e '/ Links: /s/.*Links: *//p'`
+    x=`src/lstat64 $testdir/$tmp.1 | sed -n -e '/ Links: /s/.*Links: *//p'`
     if [ "$l" -ne $x ]
     then
 	echo "Arrgh, about to remove link #$l and lstat64 looks like ..."
-	src/lstat64 $TEST_DIR/$tmp.1
+	src/lstat64 $testdir/$tmp.1
 	status=1
     fi
-    rm -f $TEST_DIR/$tmp.$l
+    rm -f $testdir/$tmp.$l
 done
 
 # success, all done