move test for xfs kernel quota into common.quota.

diff --git a/050 b/050
index f0d3584b4f53865f3a66ac66174991efb55d272d..d65c7c5b81d87fcd1eb0966040375c3950b95870 100755 (executable)
--- a/050
+++ b/050
@@ -84,10 +84,7 @@ chmod a+w $seq.full  # arbitrary users will write here
 _mymount
 
 # setup exactly what it is we'll be testing
-if ! src/feature -q $SCRATCH_DEV
-then
-       _notrun "XFS quota not enabled"
-elif src/feature -u $SCRATCH_DEV
+if src/feature -u $SCRATCH_DEV
 then
        type=u ; id=`_choose_uid`; ln $seq.usrquota $seq.out
 elif src/feature -g $SCRATCH_DEV

diff --git a/common.quota b/common.quota
index 54b49cfe58f904690e24237419ee50b0dec0bc41..9e7649ad33d79787e87315658d51a96f019e3da9 100644 (file)
--- a/common.quota
+++ b/common.quota
@@ -39,12 +39,13 @@
 # 
 _require_quota()
 {
+    src/feature -q $SCRATCH_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)