diff mbox series

[v11,4/6] common/quota: move _qsetup() helper to common code

Message ID 20210327111856.1211544-5-brauner@kernel.org (mailing list archive)
State New
Headers show
Series fstests: add idmapped mounts tests | expand

Commit Message

Christian Brauner March 27, 2021, 11:18 a.m. UTC
From: Christian Brauner <christian.brauner@ubuntu.com>

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>
---
/* v1 - v9 */
patch not present

/* v10 */
patch introduced

/* v11 */
unchanged
---
 common/quota  | 20 ++++++++++++++++++++
 tests/xfs/050 | 19 -------------------
 tests/xfs/299 | 19 -------------------
 3 files changed, 20 insertions(+), 38 deletions(-)
diff mbox series

Patch

diff --git a/common/quota b/common/quota
index 1437d5f7..32a9a555 100644
--- 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
 }
 
+# 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
diff --git a/tests/xfs/050 b/tests/xfs/050
index 1df97537..e7c81d0a 100755
--- a/tests/xfs/050
+++ b/tests/xfs/050
@@ -69,25 +69,6 @@  _filter_and_check_blks()
 	' | _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
diff --git a/tests/xfs/299 b/tests/xfs/299
index b862e67e..26b7fcfd 100755
--- a/tests/xfs/299
+++ b/tests/xfs/299
@@ -62,25 +62,6 @@  _filter_and_check_blks()
 	' | _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()
 {