From: Jan Kara Date: Mon, 14 May 2018 17:03:51 +0000 (+0200) Subject: common/quota: Fix _qmount_options for ext4 journalled quotas X-Git-Tag: v2022.05.01~1554 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3d112df8bdc313308f3788cf28e1574d4fb15d4c;p=xfstests-dev.git common/quota: Fix _qmount_options for ext4 journalled quotas _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 Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- diff --git a/common/quota b/common/quota index 2b99521d..f01bd068 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' \