From 552dcfb47c9003bff2c809677f4db9da3453422b Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Wed, 1 Apr 2015 11:34:45 +1100 Subject: [PATCH] filter: btrfs-progs subvolume delete output changed btrfs has started emitting new information from cmd_subvol_delete(), so filter that out or it breaks btrfs/001: -Delete subvolume 'SCRATCH_MNT/snap' +Delete subvolume (no-commit): 'SCRATCH_MNT/snap' (Spell "transaction" correctly while we're at it.) Signed-off-by: Eric Sandeen Reviewed-by: Eryu Guan Signed-off-by: Dave Chinner --- common/filter.btrfs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/filter.btrfs b/common/filter.btrfs index ea047c55..9bb64792 100644 --- a/common/filter.btrfs +++ b/common/filter.btrfs @@ -57,13 +57,14 @@ _filter_btrfs_device_stats() sed -e "s/ *$NUMDEVS / /g" } -_filter_transcation_commit_default() { - sed -e "/Transaction commit: none (default)/d" +_filter_transaction_commit() { + sed -e "/Transaction commit: none (default)/d" | \ + sed -e "s/Delete subvolume (.*commit):/Delete subvolume/g" } _filter_btrfs_subvol_delete() { - _filter_scratch | _filter_transcation_commit_default + _filter_scratch | _filter_transaction_commit } -- 2.39.5