From patchwork Mon Jun 18 17:44:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Benatto X-Patchwork-Id: 10472441 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 B7ACC6053C for ; Mon, 18 Jun 2018 17:44:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A988928B56 for ; Mon, 18 Jun 2018 17:44:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9DE1028B59; Mon, 18 Jun 2018 17:44:41 +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 3D02728B58 for ; Mon, 18 Jun 2018 17:44:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935127AbeFRRok (ORCPT ); Mon, 18 Jun 2018 13:44:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54938 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934957AbeFRRoj (ORCPT ); Mon, 18 Jun 2018 13:44:39 -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 B49E73084023; Mon, 18 Jun 2018 17:44:39 +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 A919698E19; Mon, 18 Jun 2018 17:44:35 +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 1/2] common/xfs: Add _scratch_get_sfdir_prefix function Date: Mon, 18 Jun 2018 14:44:32 -0300 Message-Id: <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.40]); Mon, 18 Jun 2018 17:44:39 +0000 (UTC) Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move get_sfdir_prefix function from xfs/278 to commom/xfs and rename it to _scratch_get_sfdir_prefix so it can be used in other xfs tests. This commit also changes xfs/278 to make use of _scratch_get_sfdir_prefix instead previous one. Signed-off-by: Marco Benatto Reviewed-by: Darrick J. Wong --- common/xfs | 15 +++++++++++++++ tests/xfs/278 | 16 +--------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/common/xfs b/common/xfs index 55cfa94..ecf54bb 100644 --- a/common/xfs +++ b/common/xfs @@ -760,3 +760,18 @@ _require_xfs_spaceman_command() _notrun "xfs_spaceman $command doesn't support $param" fi } + +_scratch_get_sfdir_prefix() { + local dir_ino="$1" + + for prefix in "u.sfdir3" "u.sfdir2" "u3.sfdir3"; do + if [ -n "$(_scratch_xfs_get_metadata_field \ + "${prefix}.hdr.parent.i4" \ + "inode ${dir_ino}")" ]; then + echo "${prefix}" + return 0 + fi + done + _scratch_xfs_db -c "inode ${dir_ino}" -c 'p' >> $seqres.full + return 1 +} diff --git a/tests/xfs/278 b/tests/xfs/278 index 3d2a846..c208e61 100755 --- a/tests/xfs/278 +++ b/tests/xfs/278 @@ -46,25 +46,11 @@ _scratch_unmount echo "Silence is goodness..." -get_sfdir_prefix() { - local dir_ino="$1" - - for prefix in "u.sfdir3" "u.sfdir2" "u3.sfdir3"; do - if [ -n "$(_scratch_xfs_get_metadata_field \ - "${prefix}.hdr.parent.i4" \ - "inode ${dir_ino}")" ]; then - echo "${prefix}" - return 0 - fi - done - _scratch_xfs_db -c "inode ${dir_ino}" -c 'p' >> $seqres.full - return 1 -} set_ifield() { _scratch_xfs_set_metadata_field "$1" 0 "inode $2" >> $seqres.full } -sfdir_prefix="$(get_sfdir_prefix "$DIR_INO" || \ +sfdir_prefix="$(_scratch_get_sfdir_prefix "$DIR_INO" || \ _fail "Cannot determine sfdir prefix")" # Corrupt DIR