From b3ff58fa319a103e54bdc70b78fa225ac5683945 Mon Sep 17 00:00:00 2001 From: Su Yue Date: Thu, 7 Mar 2024 12:04:08 +0800 Subject: [PATCH] btrfs/172,206: call _log_writes_cleanup in _cleanup Because block group tree requires require no-holes feature, _log_writes_mkfs "-O ^no-holes" fails when "-O block-group-tree" is given in MKFS_OPTION. Without explicit _log_writes_cleanup, the two tests fail with logwrites-test device left. And all next tests will fail due to SCRATCH DEVICE EBUSY. Fix it by overriding _cleanup to call _log_writes_cleanup. Reviewed-by: Filipe Manana Reviewed-by: Qu Wenruo Signed-off-by: Su Yue Signed-off-by: Zorro Lang --- tests/btrfs/172 | 7 +++++++ tests/btrfs/206 | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/tests/btrfs/172 b/tests/btrfs/172 index f5acc698..f2997c04 100755 --- a/tests/btrfs/172 +++ b/tests/btrfs/172 @@ -13,6 +13,13 @@ . ./common/preamble _begin_fstest auto quick log replay recoveryloop +_cleanup() +{ + cd / + _log_writes_cleanup &> /dev/null + rm -f $tmp.* +} + # Import common functions. . ./common/filter . ./common/dmlogwrites diff --git a/tests/btrfs/206 b/tests/btrfs/206 index f6571649..6ac3d27b 100755 --- a/tests/btrfs/206 +++ b/tests/btrfs/206 @@ -14,6 +14,13 @@ . ./common/preamble _begin_fstest auto quick log replay recoveryloop punch prealloc +_cleanup() +{ + cd / + _log_writes_cleanup &> /dev/null + rm -f $tmp.* +} + # Import common functions. . ./common/filter . ./common/dmlogwrites -- 2.47.3