diff options
| author | Jan Kara <jack@suse.cz> | 2018-05-14 19:03:51 +0200 |
|---|---|---|
| committer | Eryu Guan <guaneryu@gmail.com> | 2018-05-16 14:21:59 +0800 |
| commit | 3d112df8bdc313308f3788cf28e1574d4fb15d4c (patch) | |
| tree | 822c32c6db8436a627496f20a433f27e40243bc3 | |
| parent | b2bffe5c77d6d680361c57015c79396de166b138 (diff) | |
| download | xfstests-dev-3d112df8bdc313308f3788cf28e1574d4fb15d4c.tar.gz | |
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>
| -rw-r--r-- | common/quota | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/common/quota b/common/quota index 2b99521df4..f01bd06838 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' \ |