move mount stuff into common quota file, tidy a little, make a default.

[xfstests-dev.git] / common.quota

diff --git a/common.quota b/common.quota
index 54b49cfe58f904690e24237419ee50b0dec0bc41..732fe8b12ef46666f5c7e83f170f8ad91f553447 100644 (file)
--- a/common.quota
+++ b/common.quota
@@ -39,12 +39,13 @@
 # 
 _require_quota()
 {
+    src/feature -q $TEST_DEV
+    [ $? -ne 0 ] && _notrun "Installed kernel does not support XFS quota"
+
     [ ! -x /usr/sbin/repquota ] && _notrun "Quota user tools not installed"
 
     /usr/sbin/repquota -m -s -a >/dev/null 2>&1
     [ $? -ne 0 ] && _notrun "Installed quota tools do not support XFS"
-
-    [ ! -f /proc/fs/xfs/xqm ] && _notrun "Kernel does not support XFS quota"
 }
 
 # create a file as a specific user (uid)
@@ -86,6 +87,13 @@ _filter_repquota()
     perl -ne 's/^(\w+)\s+([-|+])/[NAME]    \2/g; print'
 }
 
+_qmount()
+{
+    umount $SCRATCH_DEV >/dev/null 2>&1
+    mount -t xfs $SCRATCH_DEV $SCRATCH_MNT || _fail "qmount failed"
+    chmod ugo+rwx $SCRATCH_MNT
+    misc/quot $SCRATCH_DEV >>$seq.full 2>&1
+}
 
 # make sure this script returns success
 /bin/true