xfs
[Top] [All Lists]

[PATCH 1/8] Fix test whether kernel supports quotas

To: xfs@xxxxxxxxxxx
Subject: [PATCH 1/8] Fix test whether kernel supports quotas
From: Jan Kara <jack@xxxxxxx>
Date: Mon, 24 May 2010 16:14:12 +0200
Cc: hch@xxxxxxxxxxxxx, david@xxxxxxxxxxxxx, Jan Kara <jack@xxxxxxx>
In-reply-to: <1274710459-11446-1-git-send-email-jack@xxxxxxx>
References: <1274710459-11446-1-git-send-email-jack@xxxxxxx>
For all 2.6 kernels presence of quota support in kernel can be detected by
checking /proc/sys/fs/quota. This is actually more reliable than trying to
mount a filesystem with quota options (for example because SCRATCH_DEV does
not have to contain a filesystem type we are going to test).

Signed-off-by: Jan Kara <jack@xxxxxxx>
---
 common.quota |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common.quota b/common.quota
index 51bdc71..d32e285 100644
--- a/common.quota
+++ b/common.quota
@@ -27,10 +27,11 @@
 _require_quota()
 {
     [ -x /usr/bin/quota ] || _notrun "Quota user tools not installed"
-    _scratch_mount "-o usrquota,grpquota"
-    ret=$?
-    umount $SCRATCH_MNT
-    [ $ret -ne 0 ] && _notrun "Installed kernel does not support quota"
+    if [ $FSTYP = "xfs" ]; then
+       [ -f /proc/fs/xfs/xqmstat ] || _notrun "Installed kernel does not 
support XFS quota"
+    elif [ $FSTYP != "gfs2" ]; then
+       [ -d /proc/sys/fs/quota ] || _notrun "Installed kernel does not support 
quota"
+    fi
 }
 
 #
-- 
1.6.4.2

<Prev in Thread] Current Thread [Next in Thread>