From: Jan Kara <jack@suse.cz>
To: fstests@vger.kernel.org
Cc: Jan Kara <jack@suse.cz>
Subject: [PATCH 1/3] common/quota: Make project quota handling work for ext2 & ext3
Date: Mon, 14 May 2018 19:03:49 +0200 [thread overview]
Message-ID: <20180514170351.13737-2-jack@suse.cz> (raw)
In-Reply-To: <20180514170351.13737-1-jack@suse.cz>
Project quota can work for ext2 & ext3 the same way as for ext4. Handle
them properly as currently the tests just fail because of unknown
prjquota mount option. After this patch, tests will be "not run" because
ext4 driver refuses to use project quota mount options for "old" fs
types.
Signed-off-by: Jan Kara <jack@suse.cz>
---
common/quota | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/quota b/common/quota
index f8e037995ad4..2b99521df43d 100644
--- a/common/quota
+++ b/common/quota
@@ -90,9 +90,9 @@ _require_xfs_quota_foreign()
_require_prjquota()
{
[ -n "$1" ] && _dev="$1" || _dev="$TEST_DEV"
- if [ "$FSTYP" == "ext4" ]; then
+ if [[ "$FSTYP" == ext[234] ]]; then
dumpe2fs -h $_dev 2>&1 | grep -qw project || \
- _notrun "Project quota not available on this ext4"
+ _notrun "Project quota not available on this $FSTYP"
fi
src/feature -P $_dev
[ $? -ne 0 ] && _notrun "Installed kernel does not support project quotas"
@@ -116,7 +116,7 @@ _require_getnextquota()
# prior to mount. This is a relatively new feature ...
_scratch_enable_pquota()
{
- [ "$FSTYP" != "ext4" ] && return
+ [[ "$FSTYP" != ext[234] ]] && return
tune2fs -O quota,project $SCRATCH_DEV >>$seqres.full 2>&1
_try_scratch_mount >/dev/null 2>&1 \
@@ -242,7 +242,7 @@ _qmount_option()
# ext4 doesn't _do_ "-o pquota/prjquota" because reasons
# Switch it to "quota" to enable mkfs-time pquota
- if [ "$FSTYP" == "ext4" ]; then
+ if [[ "$FSTYP" == ext[234] ]]; then
OPTS=`echo $OPTS \
| sed -e 's/\bpquota/quota/g' \
-e 's/prjquota/quota/g'`
--
2.13.6
next prev parent reply other threads:[~2018-05-14 17:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-14 17:03 [PATCH 0/3] Fix various small quota tests issues for ext[234] Jan Kara
2018-05-14 17:03 ` Jan Kara [this message]
2018-05-14 17:03 ` [PATCH 2/3] generic/382: Fix test when report uses /etc/passwd Jan Kara
2018-05-17 2:42 ` Eryu Guan
2018-05-17 9:18 ` Jan Kara
2018-05-17 10:06 ` Jan Kara
2018-05-19 11:45 ` Eryu Guan
2018-05-18 4:02 ` Dave Chinner
2018-05-18 9:07 ` Jan Kara
2018-05-14 17:03 ` [PATCH 3/3] common/quota: Fix _qmount_options for ext4 journalled quotas Jan Kara
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=20180514170351.13737-2-jack@suse.cz \
--to=jack@suse.cz \
--cc=fstests@vger.kernel.org \
/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