I recently changed clear_cache to not appear in mount options, as it has
one shot semantics, which was breaking this test. Test explicitly that
it _doesn't_ appear, which properly fails on old filesystems and passes
on misc-next.
The patch that changed this behavior was:
8b228324a8ce btrfs: clear free space tree on ro->rw remount
Separately, inode_cache is deprecated and will never appear in mount
options; remove it entirely.
Signed-off-by: Boris Burkov
---
tests/btrfs/220 | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/tests/btrfs/220 b/tests/btrfs/220
index c84c7065..1242460f 100755
--- a/tests/btrfs/220
+++ b/tests/btrfs/220
@@ -215,11 +215,8 @@ test_optional_kernel_features()
test_non_revertible_options()
{
- test_mount_opt "clear_cache" "clear_cache"
test_mount_opt "degraded" "degraded"
- test_mount_opt "inode_cache" "inode_cache"
-
# nologreplay should be used only with
test_should_fail "nologreplay"
test_mount_opt "nologreplay,ro" "ro,rescue=nologreplay"
@@ -238,6 +235,11 @@ test_non_revertible_options()
test_mount_opt "rescue=nologreplay,ro" "ro,rescue=nologreplay"
}
+test_one_shot_options()
+{
+ test_mount_opt "clear_cache" ""
+}
+
# All these options can be reverted (with their "no" counterpart), or can have
# their values set to default on remount
test_revertible_options()
@@ -321,6 +323,8 @@ test_optional_kernel_features
test_non_revertible_options
+test_one_shot_options
+
test_revertible_options
test_subvol
--
2.24.1
