f2fs/015: Fix mount syntax for disabling jquota

F2FS has removed the trailing "=" in the mount options for disabling
user, group, and project journaled quotas. To maintain compatibility,
update the test cases in f2fs/015 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/015 b/tests/f2fs/015
index 81ea981833f29a2c1d63c77a39a8aa7a5e58e085..54cada4a867904f185e506cce3d76db7bc263caa 100755 (executable)
--- a/tests/f2fs/015
+++ b/tests/f2fs/015
@@ -66,9 +66,9 @@ options=(
        "usrjquota=ausrquota"           ""                      \
        "grpjquota=agrpquota"           ""                      \
        "prjjquota=aprjquota"           ""                      \
-       "usrjquota="                    ""                      \
-       "grpjquota="                    ""                      \
-       "prjjquota="                    ""                      \
+       "usrjquota"                     ""                      \
+       "grpjquota"                     ""                      \
+       "prjjquota"                     ""                      \
        "usrjquota=ausrquota"           "extra_attr,quota,project_quota"        \
        "grpjquota=agrpquota"           "extra_attr,quota,project_quota"        \
        "prjjquota=aprjquota"           "extra_attr,quota,project_quota"        \
@@ -119,7 +119,12 @@ do
        else
                _scratch_mkfs >> $seqres.full || _fail "mkfs failed"
        fi
-       _try_scratch_mount "-o ${options[$i]}" >> $seqres.full 2>&1
+       if [[ "${options[$i]}" == *jquota ]]; then
+               _try_scratch_mount "-o ${options[$i]}" >> $seqres.full 2>&1 || \
+                       _try_scratch_mount "-o ${options[$i]}=" >> $seqres.full 2>&1
+       else
+               _try_scratch_mount "-o ${options[$i]}" >> $seqres.full 2>&1
+       fi
        echo $?
        _scratch_unmount >> $seqres.full 2>&1
 done

diff --git a/tests/f2fs/015.out b/tests/f2fs/015.out
index cd273550065f33c54fa58541ad1a87ec31e89697..45ef9ea87fe253752ebc49dbb7f744cbfa0c07b2 100644 (file)
--- a/tests/f2fs/015.out
+++ b/tests/f2fs/015.out
@@ -101,11 +101,11 @@ Option#98: grpjquota=agrpquota :
 32
 Option#100: prjjquota=aprjquota : 
 32
-Option#102: usrjquota= : 
+Option#102: usrjquota : 
 0
-Option#104: grpjquota= : 
+Option#104: grpjquota : 
 0
-Option#106: prjjquota= : 
+Option#106: prjjquota : 
 0
 Option#108: usrjquota=ausrquota : extra_attr,quota,project_quota
 0