f2fs/021: Fix mount syntax for disabling jquota

F2FS has removed the trailing "=" in the mount options for disabling
user journaled quotas. Update f2fs/021 to try the new syntax first and
fall back to the legacy syntax if the initial mount attempt fails.

Signed-off-by: Joanne Chang <joannechien@google.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/tests/f2fs/021 b/tests/f2fs/021
index 0cacb1386e1026c966f4f9af38db11702bdabb26..70b10fa819f7e2e49697fbc1609da736ddcea619 100755 (executable)
--- a/tests/f2fs/021
+++ b/tests/f2fs/021
@@ -21,7 +21,9 @@ quotacheck -uc $SCRATCH_MNT
 _scratch_unmount
 
 _scratch_mount "-o usrjquota=aquota.user,jqfmt=vfsold"
-_scratch_mount "-o remount,usrjquota=,jqfmt=vfsold"
+if ! _try_scratch_mount "-o remount,usrjquota,jqfmt=vfsold" >> $seqres.full 2>&1; then
+       _scratch_mount "-o remount,usrjquota=,jqfmt=vfsold"
+fi
 _scratch_unmount
 
 echo "Silence is golden"