updates to run (more) cleanly with quota mount option(s). expanded

notrun messages for those tests which are skipped with more details.

033

@@ -45,7 +45,14 @@ echo "QA output created by $seq"
 here=`pwd`
 tmp=/tmp/$$
 status=1	# failure is the default!
-trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+	umount $SCRATCH_DEV 2>/dev/null
+	rm -f $tmp.*
+}
+
+trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
 . ./common.rc
@@ -71,11 +78,19 @@ _require_scratch
 mkfs -t xfs -f -i size=512 $SCRATCH_DEV | _filter_mkfs 2>/dev/null
 `xfs_db -r -c sb -c p $SCRATCH_DEV | grep 'ino = ' | \
 	sed -e 's/ //g' -e 's/^/export /'`
+
+# check we won't get any quota inodes setup on mount
+mount -t xfs $SCRATCH_DEV $SCRATCH_MNT
+src/feature -U $SCRATCH_DEV && \
+	_notrun "Quota are enabled, test needs controlled sb recovery"
+src/feature -G $SCRATCH_DEV && \
+	_notrun "Quota are enabled, test needs controlled sb recovery"
+umount $SCRATCH_DEV
+
 # rootino, rbmino, and rsumino are now set (lets blow em away!)
 _check_root_inos 0
 _check_root_inos -1
 
-
 # success, all done
 status=0
 exit