From: Josef Bacik <josef@xxxxxxxxxxxxxx> Some of our btrfs subvolume delete calls get put into the golden output, and many of them simply _filter_scratch. This works fine, but we recently changed btrfs subvolume delete output, and it would have been nice to simply filter this in one place. We have a _filter_btrfs_subvol_delete helper, but it's only used in one place. Fix all of these uses to call _filter_btrfs_subvol_delete, this will allow for follow up fixes against _filter_btrfs_subvol_delete itself to deal with changed output. Signed-off-by: Josef Bacik <josef@xxxxxxxxxxxxxx> --- tests/btrfs/287 | 4 ++-- tests/btrfs/287.out | 2 +- tests/btrfs/293 | 6 +++--- tests/btrfs/293.out | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/btrfs/287 b/tests/btrfs/287 index 04871d46036aa2..64e6ef35250c8e 100755 --- a/tests/btrfs/287 +++ b/tests/btrfs/287 @@ -9,7 +9,7 @@ . ./common/preamble _begin_fstest auto quick snapshot clone punch logical_resolve -. ./common/filter +. ./common/filter.btrfs . ./common/reflink _supported_fs btrfs @@ -148,7 +148,7 @@ echo "resolve second extent with ignore offset option:" query_logical_ino -o $second_extent_bytenr | filter_snapshot_ids # Now delete the first snapshot and repeat the last 2 queries. -$BTRFS_UTIL_PROG subvolume delete -C $SCRATCH_MNT/snap1 | _filter_scratch +$BTRFS_UTIL_PROG subvolume delete -C $SCRATCH_MNT/snap1 | _filter_btrfs_subvol_delete # Query the second extent with an offset of 0, should return file offsets 12M # and 20M for the default subvolume (root 5) and file offsets 4M, 12M and 20M diff --git a/tests/btrfs/287.out b/tests/btrfs/287.out index 0d69473364fa31..30eac8fa444c8f 100644 --- a/tests/btrfs/287.out +++ b/tests/btrfs/287.out @@ -79,7 +79,7 @@ inode 257 offset 4194304 snap1 inode 257 offset 20971520 root 5 inode 257 offset 12582912 root 5 inode 257 offset 5242880 root 5 -Delete subvolume (commit): 'SCRATCH_MNT/snap1' +Delete subvolume 'SCRATCH_MNT/snap1' resolve second extent: inode 257 offset 20971520 snap2 inode 257 offset 12582912 snap2 diff --git a/tests/btrfs/293 b/tests/btrfs/293 index cded956468ee9a..06f96dc414b05b 100755 --- a/tests/btrfs/293 +++ b/tests/btrfs/293 @@ -18,7 +18,7 @@ _cleanup() test -n "$swap_file" && swapoff $swap_file &> /dev/null } -. ./common/filter +. ./common/filter.btrfs _supported_fs btrfs _fixed_by_kernel_commit deccae40e4b3 \ @@ -40,7 +40,7 @@ echo "Activating swap file... (should fail due to snapshots)" _swapon_file $swap_file 2>&1 | _filter_scratch echo "Deleting first snapshot..." -$BTRFS_UTIL_PROG subvolume delete -c $SCRATCH_MNT/snap1 | _filter_scratch +$BTRFS_UTIL_PROG subvolume delete -c $SCRATCH_MNT/snap1 | _filter_btrfs_subvol_delete # We deleted the snapshot and committed the transaction used to delete it (-c), # but all its extents are actually only deleted in the background, by the cleaner @@ -55,7 +55,7 @@ echo "Activating swap file... (should fail due to snapshot)" _swapon_file $swap_file 2>&1 | _filter_scratch echo "Deleting second snapshot..." -$BTRFS_UTIL_PROG subvolume delete -c $SCRATCH_MNT/snap2 | _filter_scratch +$BTRFS_UTIL_PROG subvolume delete -c $SCRATCH_MNT/snap2 | _filter_btrfs_subvol_delete echo "Remounting and waiting for cleaner thread to remove the second snapshot..." _scratch_remount commit=1 diff --git a/tests/btrfs/293.out b/tests/btrfs/293.out index 2ac1663281947a..fd04ac9139b849 100644 --- a/tests/btrfs/293.out +++ b/tests/btrfs/293.out @@ -6,12 +6,12 @@ Create a snapshot of 'SCRATCH_MNT' in 'SCRATCH_MNT/snap2' Activating swap file... (should fail due to snapshots) swapon: SCRATCH_MNT/swapfile: swapon failed: Invalid argument Deleting first snapshot... -Delete subvolume (commit): 'SCRATCH_MNT/snap1' +Delete subvolume 'SCRATCH_MNT/snap1' Remounting and waiting for cleaner thread to remove the first snapshot... Activating swap file... (should fail due to snapshot) swapon: SCRATCH_MNT/swapfile: swapon failed: Invalid argument Deleting second snapshot... -Delete subvolume (commit): 'SCRATCH_MNT/snap2' +Delete subvolume 'SCRATCH_MNT/snap2' Remounting and waiting for cleaner thread to remove the second snapshot... Activating swap file... Disabling swap file... -- 2.42.1
