From: Su Yue <glass.su@xxxxxxxx> 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. Signed-off-by: Su Yue <glass.su@xxxxxxxx> --- tests/btrfs/172 | 6 ++++++ tests/btrfs/206 | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/tests/btrfs/172 b/tests/btrfs/172 index f5acc6982cd7..fceff56c9d37 100755 --- a/tests/btrfs/172 +++ b/tests/btrfs/172 @@ -13,6 +13,12 @@ . ./common/preamble _begin_fstest auto quick log replay recoveryloop +# Override the default cleanup function. +_cleanup() +{ + _log_writes_cleanup &> /dev/null +} + # Import common functions. . ./common/filter . ./common/dmlogwrites diff --git a/tests/btrfs/206 b/tests/btrfs/206 index f6571649076f..e05adf75b67e 100755 --- a/tests/btrfs/206 +++ b/tests/btrfs/206 @@ -14,6 +14,12 @@ . ./common/preamble _begin_fstest auto quick log replay recoveryloop punch prealloc +# Override the default cleanup function. +_cleanup() +{ + _log_writes_cleanup &> /dev/null +} + # Import common functions. . ./common/filter . ./common/dmlogwrites -- 2.43.0