From patchwork Mon Jun 18 17:44:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Benatto X-Patchwork-Id: 10472443 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 19A3D601D7 for ; Mon, 18 Jun 2018 17:44:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C03428B56 for ; Mon, 18 Jun 2018 17:44:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 00A7D28B68; Mon, 18 Jun 2018 17:44:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8187E28B56 for ; Mon, 18 Jun 2018 17:44:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935344AbeFRRom (ORCPT ); Mon, 18 Jun 2018 13:44:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57052 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934957AbeFRRol (ORCPT ); Mon, 18 Jun 2018 13:44:41 -0400 Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 53D9830820C0; Mon, 18 Jun 2018 17:44:41 +0000 (UTC) Received: from barchetta.redhat.com (ovpn-116-44.gru2.redhat.com [10.97.116.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 16C5F990A9; Mon, 18 Jun 2018 17:44:39 +0000 (UTC) From: Marco Benatto To: fstests@vger.kernel.org Cc: linux-xfs@vger.kernel.org, mbenatto@redhat.com, darrick.wong@oracle.com, sandeen@redhat.com Subject: [PATCH 2/2] xfstests: Test root inode parent pointer repairing Date: Mon, 18 Jun 2018 14:44:33 -0300 Message-Id: <20180618174433.3069-2-mbenatto@redhat.com> In-Reply-To: <20180618174433.3069-1-mbenatto@redhat.com> References: <20180618174433.3069-1-mbenatto@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Mon, 18 Jun 2018 17:44:41 +0000 (UTC) Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Recently we found out xfs_repair were not repairing root inode parent pointer when root inode is on short-form and parent points to an invalid inode number (refer to: "xfs_repair: Fix root inode's parent when it's bogus for sf directory" on xfs-devel list). This test checks if xfs_repair successfully repair the filesystem in the scenario mentioned before. Signed-off-by: Marco Benatto Reviewed-by: Darrick J. Wong --- tests/xfs/450 | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/450.out | 1 + tests/xfs/group | 1 + 3 files changed, 55 insertions(+) create mode 100755 tests/xfs/450 create mode 100644 tests/xfs/450.out diff --git a/tests/xfs/450 b/tests/xfs/450 new file mode 100755 index 0000000..dc7f244 --- /dev/null +++ b/tests/xfs/450 @@ -0,0 +1,53 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2018 Red Hat Inc. All Rights Reserved. +# +# FS QA Test 450 +# +# Make sure xfs_repair can repair root inode parent's pointer +# when it contains a bogus ino when it's using shot form directory +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq + +status=1 # failure is the default! + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here + +# Modify as appropriate. +_supported_fs xfs +_supported_os Linux +_require_scratch + + +_scratch_mkfs >> /dev/null 2>&1 + +rootino=$(_scratch_xfs_get_metadata_field 'rootino' 'sb 0') + +prefix=$(_scratch_get_sfdir_prefix ${rootino} || \ + _fail "Cannot determine sfdir prefix") + + +# Corrupt root inode parent pointer +_scratch_xfs_set_metadata_field "${prefix}.hdr.parent.i4" 0 "inode ${rootino}"\ + >> $seqres.full + +_scratch_xfs_repair >> $seqres.full 2>&1 + +_scratch_xfs_repair -n >> $seqres.full 2>&1 + +if [ $? -eq 1 ] +then + _fail "xfs_repair failed to repair filesystem" +fi + +echo "OK" +status=0 +exit diff --git a/tests/xfs/450.out b/tests/xfs/450.out new file mode 100644 index 0000000..d86bac9 --- /dev/null +++ b/tests/xfs/450.out @@ -0,0 +1 @@ +OK diff --git a/tests/xfs/group b/tests/xfs/group index 932ab90..3a1db0b 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -447,3 +447,4 @@ 447 auto mount 448 auto quick fuzzers 449 auto quick +450 auto quick