Skip to contentSkip to conversation

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

PATCH In review Joanne Chang 3 participants 3 messages Apr 28 – May 9

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 tests/f2fs/022 | 1 +
 tests/f2fs/023 | 1 +
 2 files changed, 2 insertions(+)
tests/f2fs/022 +1 -0
index 728ef4e8..854ec327 100755
@@ -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
tests/f2fs/023 +1 -0
index 33108421..f3e8785f 100755
@@ -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
Signature · 1 line
2.54.0.rc2.544.gc7ae2d5bb8-goog
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Joanne Chang

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.

---

Hmm, Makes sense to me.

Quoted 31 lines
 tests/f2fs/022 | 1 +
 tests/f2fs/023 | 1 +
 2 files changed, 2 insertions(+)
tests/f2fs/022 +1 -0
index 728ef4e8..854ec327 100755
@@ -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
tests/f2fs/023 +1 -0
index 33108421..f3e8785f 100755
@@ -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
Signature · 1 line
2.54.0.rc2.544.gc7ae2d5bb8-goog