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 <jack@suse.cz>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/common/quota b/common/quota
index 2b99521df43d7c2d53821f8e1207389a34f782e4..f01bd068383bcad7aaf12e0dd823eabc3c45cfc3 100644 (file)
--- 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'       \