From: Jan Kara <jack@suse.cz>
To: fstests@vger.kernel.org
Cc: Jan Kara <jack@suse.cz>
Subject: [PATCH 3/3] common/quota: Fix _qmount_options for ext4 journalled quotas
Date: Mon, 14 May 2018 19:03:51 +0200 [thread overview]
Message-ID: <20180514170351.13737-4-jack@suse.cz> (raw)
In-Reply-To: <20180514170351.13737-1-jack@suse.cz>
_qmount_options didn't properly replace ext[34] journalled quotas mount
options. As such the mount option string got garbled and the test
(e.g. generic/379) failed.
Signed-off-by: Jan Kara <jack@suse.cz>
---
common/quota | 2 ++
1 file changed, 2 insertions(+)
diff --git a/common/quota b/common/quota
index 2b99521df43d..f01bd068383b 100644
--- a/common/quota
+++ b/common/quota
@@ -229,8 +229,10 @@ _qmount_option()
export MOUNT_OPTIONS=`echo $MOUNT_OPTIONS \
| sed -e 's/uquota/QUOTA/g' \
-e 's/usrquota/QUOTA/g' \
+ -e 's/usrjquota=[^, ]/QUOTA/g' \
-e 's/gquota/QUOTA/g' \
-e 's/grpquota/QUOTA/g' \
+ -e 's/grpjquota=[^, ]/QUOTA/g' \
-e 's/\bpquota/QUOTA/g' \
-e 's/prjquota/QUOTA/g' \
-e 's/quota/QUOTA/g' \
--
2.13.6
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 ` [PATCH 1/3] common/quota: Make project quota handling work for ext2 & ext3 Jan Kara
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 ` Jan Kara [this message]
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-4-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