From patchwork Tue Mar 23 04:20:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 12156845 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7EA9C433E9 for ; Tue, 23 Mar 2021 04:21:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8AA21619B2 for ; Tue, 23 Mar 2021 04:21:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229692AbhCWEVG (ORCPT ); Tue, 23 Mar 2021 00:21:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:47000 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229665AbhCWEUu (ORCPT ); Tue, 23 Mar 2021 00:20:50 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6FF8B6198E; Tue, 23 Mar 2021 04:20:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1616473250; bh=GDWjU4DCIze5DwS4eYYYPuxPlGnlspEYDBe52dhwOH8=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=UqBkY2vVm08AEoCJW29uqVwHyXC43heW3b0CtBn7PMZ6fZD1CyRPaUoa4PQ9L1ws1 2UHEdbHl+azbMGjhPTu8d7C1bmW9PPR6c+5mra4igZcZkrW+JoLfrvX45qx50sKJIO l0wox21CfvxikDAAJ56FcgBdN+DKfr+pUlL1epcxYHUHz/GQg1GJOdH3Rcp68k4tyt DnTIPzk5n0fCp/JylkLyB5M96SEiZPu2Y5SGJDPuPgGHx/FTR49Y3CHBEm8/1in58t NZmI/wC3yGcJH6PuO9TsiDc00etm51RE9NbTfkqJ5zonnmLq/fWORwEFACXIamCMWl j5AKaqXhYuq1g== Subject: [PATCH 1/3] xfs/{010,030}: update repair output to deal with inobtcount feature From: "Darrick J. Wong" To: djwong@kernel.org, guaneryu@gmail.com Cc: Brian Foster , linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me Date: Mon, 22 Mar 2021 21:20:50 -0700 Message-ID: <161647325010.3431131.10019758464943956019.stgit@magnolia> In-Reply-To: <161647324459.3431131.16341235245632737552.stgit@magnolia> References: <161647324459.3431131.16341235245632737552.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org From: Darrick J. Wong Update both of these tests to filter out the new error messages from repair when the inode btree counter feature is enabled. Signed-off-by: Darrick J. Wong Reviewed-by: Brian Foster --- tests/xfs/010 | 3 ++- tests/xfs/030 | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/xfs/010 b/tests/xfs/010 index 1f9bcdff..95cc2555 100755 --- a/tests/xfs/010 +++ b/tests/xfs/010 @@ -113,7 +113,8 @@ _check_scratch_fs _corrupt_finobt_root $SCRATCH_DEV filter_finobt_repair() { - sed -e '/^agi has bad CRC/d' | \ + sed -e '/^agi has bad CRC/d' \ + -e '/^bad finobt block/d' | \ _filter_repair_lostblocks } diff --git a/tests/xfs/030 b/tests/xfs/030 index 04440f9c..906d9019 100755 --- a/tests/xfs/030 +++ b/tests/xfs/030 @@ -44,6 +44,8 @@ _check_ag() -e '/^bad agbno AGBNO for refcntbt/d' \ -e '/^agf has bad CRC/d' \ -e '/^agi has bad CRC/d' \ + -e '/^bad inobt block count/d' \ + -e '/^bad finobt block count/d' \ -e '/^Missing reverse-mapping record.*/d' \ -e '/^bad levels LEVELS for [a-z]* root.*/d' \ -e '/^unknown block state, ag AGNO, block.*/d'