From: Christian Brauner <brauner@kernel.org>
To: Eryu Guan <guan@eryu.me>,
fstests@vger.kernel.org, Christoph Hellwig <hch@lst.de>
Cc: "Darrick J . Wong" <djwong@kernel.org>,
David Howells <dhowells@redhat.com>,
Christian Brauner <christian.brauner@ubuntu.com>
Subject: [PATCH v13 4/6] common/quota: move _qsetup() helper to common code
Date: Mon, 12 Apr 2021 13:57:06 +0200 [thread overview]
Message-ID: <20210412115708.1628386-5-brauner@kernel.org> (raw)
In-Reply-To: <20210412115708.1628386-1-brauner@kernel.org>
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
/* v12 */
unchanged
/* v13 */
unchanged
---
common/quota | 20 ++++++++++++++++++++
tests/xfs/050 | 19 -------------------
tests/xfs/299 | 19 -------------------
3 files changed, 20 insertions(+), 38 deletions(-)
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()
{
--
2.27.0
next prev parent reply other threads:[~2021-04-12 11:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-12 11:57 [PATCH v13 0/6] fstests: add idmapped mounts tests Christian Brauner
2021-04-12 11:57 ` [PATCH v13 1/6] generic/631: add test for detached mount propagation Christian Brauner
2021-04-12 11:57 ` [PATCH v13 3/6] common/rc: add _scratch_{u}mount_idmapped() helpers Christian Brauner
2021-04-12 11:57 ` Christian Brauner [this message]
2021-04-12 11:57 ` [PATCH v13 5/6] xfs/529: quotas and idmapped mounts Christian Brauner
2021-04-12 11:57 ` [PATCH v13 6/6] xfs/530: quotas on " Christian Brauner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210412115708.1628386-5-brauner@kernel.org \
--to=brauner@kernel.org \
--cc=christian.brauner@ubuntu.com \
--cc=dhowells@redhat.com \
--cc=djwong@kernel.org \
--cc=fstests@vger.kernel.org \
--cc=guan@eryu.me \
--cc=hch@lst.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).