f2fs/{022,023}: clear MOUNT_OPTIONS alongside MKFS_OPTIONS

Currently, f2fs/022 and f2fs/023 only clears MKFS_OPTIONS. This causes
the tests to fail when leftover MOUNT_OPTIONS depend on unapplied
MKFS_OPTIONS. So MOUNT_OPTIONS should also be cleared to ensure reliable
mounting.

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

diff --git a/tests/f2fs/022 b/tests/f2fs/022
index 728ef4e89060dbd527290075119f82b8b95169be..854ec32713dff08d278ae577f526fdd621f2897d 100755 (executable)
--- a/tests/f2fs/022
+++ b/tests/f2fs/022
@@ -23,6 +23,7 @@ _require_inject_f2fs_command node i_nid
 
 # remove all mkfs options to avoid layout change of on-disk inode
 export MKFS_OPTIONS=""
+export MOUNT_OPTIONS=""
 
 foo_path=$SCRATCH_MNT/foo
 bar_path=$SCRATCH_MNT/bar

diff --git a/tests/f2fs/023 b/tests/f2fs/023
index 3310842169cc99368f8366f1ba4fac1097d4978a..f3e8785f58b111bc06122a8278b360362b9f3b51 100755 (executable)
--- a/tests/f2fs/023
+++ b/tests/f2fs/023
@@ -25,6 +25,7 @@ testfile=$SCRATCH_MNT/testfile
 
 # remove all mkfs options to avoid layout change of on-disk inode
 export MKFS_OPTIONS=""
+export MOUNT_OPTIONS=""
 
 _scratch_mkfs "-O extra_attr,flexible_inline_xattr" >> $seqres.full || _fail "mkfs failed"
 _scratch_mount "-o inline_xattr_size=512" >>$seqres.full 2>&1