diff mbox

[3/3] common/quota: Fix _qmount_options for ext4 journalled quotas

Message ID 20180514170351.13737-4-jack@suse.cz (mailing list archive)
State New, archived
Headers show

Commit Message

Jan Kara May 14, 2018, 5:03 p.m. UTC
_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 mbox

Patch

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'       \