From patchwork Tue Mar 24 22:02:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Sandeen X-Patchwork-Id: 6086241 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9F4A1BF90F for ; Tue, 24 Mar 2015 22:02:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E976220263 for ; Tue, 24 Mar 2015 22:02:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 16F192024F for ; Tue, 24 Mar 2015 22:02:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752402AbbCXWCG (ORCPT ); Tue, 24 Mar 2015 18:02:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49244 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752072AbbCXWCF (ORCPT ); Tue, 24 Mar 2015 18:02:05 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t2OM25IA022547 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 24 Mar 2015 18:02:05 -0400 Received: from liberator.sandeen.net (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t2OM23Jv007225 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Tue, 24 Mar 2015 18:02:04 -0400 Message-ID: <5511DEDB.9040804@redhat.com> Date: Tue, 24 Mar 2015 17:02:03 -0500 From: Eric Sandeen MIME-Version: 1.0 To: fstests@vger.kernel.org, linux-btrfs Subject: [PATCH] fstests: fix _filter_transcation_commit_default X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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 / /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 }