* [PATCH] fstests: fix _filter_transcation_commit_default
@ 2015-03-24 22:02 Eric Sandeen
2015-03-25 3:23 ` Eryu Guan
0 siblings, 1 reply; 2+ messages in thread
From: Eric Sandeen @ 2015-03-24 22:02 UTC (permalink / raw)
To: fstests, linux-btrfs
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@redhat.com>
---
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
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] fstests: fix _filter_transcation_commit_default
2015-03-24 22:02 [PATCH] fstests: fix _filter_transcation_commit_default Eric Sandeen
@ 2015-03-25 3:23 ` Eryu Guan
0 siblings, 0 replies; 2+ messages in thread
From: Eryu Guan @ 2015-03-25 3:23 UTC (permalink / raw)
To: Eric Sandeen; +Cc: fstests, linux-btrfs
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@redhat.com>
Looks good to me.
Reviewed-by: Eryu Guan <eguan@redhat.com>
> ---
>
> 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@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-03-25 3:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-24 22:02 [PATCH] fstests: fix _filter_transcation_commit_default Eric Sandeen
2015-03-25 3:23 ` Eryu Guan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).