On Tue, Mar 24, 2015 at 05:02:03PM -0500, Eric Sandeen wrote:
> 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 <sandeen@xxxxxxxxxx>
Looks good to me.
Reviewed-by: Eryu Guan <eguan@xxxxxxxxxx>
> ---
>
> diff --git a/common/filter.btrfs b/common/filter.btrfs
> index ea047c5..9bb6479 100644
> --- a/common/filter.btrfs
> +++ b/common/filter.btrfs
> @@ -57,13 +57,14 @@ _filter_btrfs_device_stats()
> sed -e "s/ *$NUMDEVS /<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
>
> }
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html