common/quota: move _qsetup() helper to common code

It's already used in two tests and will be used in a third.

Cc: Eryu Guan <guan@eryu.me>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Darrick J. Wong <djwong@kernel.org>
Cc: fstests@vger.kernel.org
Suggested-by: Eryu Guan <guan@eryu.me>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/common/quota b/common/quota
index 1437d5f768bcc9dbabf4f503c12c9e4aee502d6d..32a9a55593d5352f1a1227c41698271719deee93 100644 (file)
--- a/common/quota
+++ b/common/quota
@@ -329,5 +329,25 @@ _report_quota_inodes() {
        repquota $1 | egrep "^($qa_user|root|nobody)" | awk '{print $1, $6, $7, $8}' | sort -r
 }
 
        repquota $1 | egrep "^($qa_user|root|nobody)" | awk '{print $1, $6, $7, $8}' | sort -r
 }
 

+# Determine which type of quota we're using
+_qsetup()
+{
+       opt=$1
+       enforce=0
+       if [ $opt = "u" -o $opt = "uno" ]; then
+               type=u
+               eval `_choose_uid`
+       elif [ $opt = "g" -o $opt = "gno" ]; then
+               type=g
+               eval `_choose_gid`
+       elif [ $opt = "p" -o $opt = "pno" ]; then
+               type=p
+               eval `_choose_prid`
+       fi
+       [ $opt = "u" -o $opt = "g" -o $opt = "p" ] && enforce=1
+
+       echo "Using type=$type id=$id" >> $seqres.full
+}
+

 # make sure this script returns success
 /bin/true
 # make sure this script returns success
 /bin/true

diff --git a/tests/xfs/050 b/tests/xfs/050
index 1df975379922a5e3c92718aed4f5a2e59005f8f6..e7c81d0a091e0b96dafeab28b6a7eacf81f48faa 100755 (executable)
--- a/tests/xfs/050
+++ b/tests/xfs/050
@@ -69,25 +69,6 @@ _filter_and_check_blks()
        ' | _filter_quota_report
 }
 
        ' | _filter_quota_report
 }
 

-_qsetup()
-{
-       opt=$1
-       enforce=0
-       if [ $opt = "u" -o $opt = "uno" ]; then
-               type=u
-               eval `_choose_uid`
-       elif [ $opt = "g" -o $opt = "gno" ]; then
-               type=g
-               eval `_choose_gid`
-       elif [ $opt = "p" -o $opt = "pno" ]; then
-               type=p
-               eval `_choose_prid`
-       fi
-       [ $opt = "u" -o $opt = "g" -o $opt = "p" ] && enforce=1
-
-       echo "Using type=$type id=$id" >> $seqres.full
-}
-

 _exercise()
 {
        _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
 _exercise()
 {
        _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs

diff --git a/tests/xfs/299 b/tests/xfs/299
index b862e67e2f7bce4b280513be8046b54f18c11647..26b7fcfd9d1f35301403a168e220b5edf0746fe7 100755 (executable)
--- a/tests/xfs/299
+++ b/tests/xfs/299
@@ -62,25 +62,6 @@ _filter_and_check_blks()
        ' | _filter_quota_report
 }
 
        ' | _filter_quota_report
 }
 

-_qsetup()
-{
-       opt=$1
-       enforce=0
-       if [ $opt = "u" -o $opt = "uno" ]; then
-               type=u
-               eval `_choose_uid`
-       elif [ $opt = "g" -o $opt = "gno" ]; then
-               type=g
-               eval `_choose_gid`
-       elif [ $opt = "p" -o $opt = "pno" ]; then
-               type=p
-               eval `_choose_prid`
-       fi
-       [ $opt = "u" -o $opt = "g" -o $opt = "p" ] && enforce=1
-
-       echo "Using type=$type id=$id" >> $seqres.full
-}
-

 _exercise()
 {
 
 _exercise()
 {