From: Nathan Scott <nathans@sgi.com>
Date: Tue, 20 Mar 2001 02:17:03 +0000 (+0000)
Subject: move test for xfs kernel quota into common.quota.
X-Git-Tag: v1.1.0~1295
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8a4e6ccd55223f20b1591f2d991d737097b88dbb;p=xfstests-dev.git

move test for xfs kernel quota into common.quota.
---

diff --git a/050 b/050
index f0d3584b..d65c7c5b 100755
--- 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 54b49cfe..9e7649ad 100644
--- 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)