From patchwork Wed Oct 26 19:03:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13021099 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8C8DC38A2D for ; Wed, 26 Oct 2022 19:06:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234826AbiJZTGZ (ORCPT ); Wed, 26 Oct 2022 15:06:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234640AbiJZTGE (ORCPT ); Wed, 26 Oct 2022 15:06:04 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20A6D14004; Wed, 26 Oct 2022 12:03:27 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B122B62032; Wed, 26 Oct 2022 19:03:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 140AAC433C1; Wed, 26 Oct 2022 19:03:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666811006; bh=qrHimkfpB18sMOElNhiaurTTeLbXNgfGQzLygwWG86k=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=P6S5lIFuiMSLxUBafatN5BtVLo8lowIGaROnfsvoJwZHCnbUiFMRjadXSv49Lg89V rnp9AS+BAkNcIOdJki+x3+InKxl+pKyeTgKQa4j6Ty4wgWWEAWepWeEKSF04o97+43 OfgtKyXh4Q9IzVWM18ujXOfdFFgGMcg1EDN+2RgAGoDMdGajsehrlKmK9Iem5Cvewm t7QFj2P2AtrGxw1O5jaGuyp8BUV6flBBqcXA8KBqQbmTSZzIYbKnY6Azw4NZ6jOfP8 XKIp/+sOx1eTIHKgRhL1bHD2Ump6478ndx3tP/9J0FXsY0UBwY+TNMtXFkjY5mSj+E 5FQvv0YUbXisA== Subject: [PATCH 2/4] xfs: refactor filesystem directory block size extraction logic From: "Darrick J. Wong" To: djwong@kernel.org, guaneryu@gmail.com, zlang@redhat.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me Date: Wed, 26 Oct 2022 12:03:25 -0700 Message-ID: <166681100562.3403789.14498721397451474651.stgit@magnolia> In-Reply-To: <166681099421.3403789.78493769502226810.stgit@magnolia> References: <166681099421.3403789.78493769502226810.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 There are a lot of places where we open-code determining the directory block size for a specific filesystem. Refactor this into a single helper to clean up existing tests. Signed-off-by: Darrick J. Wong --- common/populate | 4 ++-- common/xfs | 9 +++++++++ tests/xfs/099 | 2 +- tests/xfs/100 | 2 +- tests/xfs/101 | 2 +- tests/xfs/102 | 2 +- tests/xfs/105 | 2 +- tests/xfs/112 | 2 +- tests/xfs/113 | 2 +- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/common/populate b/common/populate index 9fa1a06798..23b2fecf69 100644 --- a/common/populate +++ b/common/populate @@ -175,7 +175,7 @@ _scratch_xfs_populate() { _xfs_force_bdev data $SCRATCH_MNT blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")" - dblksz="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')" + dblksz="$(_xfs_get_dir_blocksize "$SCRATCH_MNT")" crc="$(_xfs_has_feature "$SCRATCH_MNT" crc -v)" if [ $crc -eq 1 ]; then leaf_hdr_size=64 @@ -602,7 +602,7 @@ _scratch_xfs_populate_check() { is_reflink=$(_xfs_has_feature "$SCRATCH_MNT" reflink -v) blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")" - dblksz="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')" + dblksz="$(_xfs_get_dir_blocksize "$SCRATCH_MNT")" leaf_lblk="$((32 * 1073741824 / blksz))" node_lblk="$((64 * 1073741824 / blksz))" umount "${SCRATCH_MNT}" diff --git a/common/xfs b/common/xfs index c7496bce3f..6445bfd9db 100644 --- a/common/xfs +++ b/common/xfs @@ -203,6 +203,15 @@ _xfs_is_realtime_file() $XFS_IO_PROG -c 'stat -v' "$1" | grep -q -w realtime } +# Get the directory block size of a mounted filesystem. +_xfs_get_dir_blocksize() +{ + local fs="$1" + + $XFS_INFO_PROG "$fs" | grep 'naming.*bsize' | \ + sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g' +} + # Set or clear the realtime status of every supplied path. The first argument # is either 'data' or 'realtime'. All other arguments should be paths to # existing directories or empty regular files. diff --git a/tests/xfs/099 b/tests/xfs/099 index a7eaff6e0c..82bef8ad26 100755 --- a/tests/xfs/099 +++ b/tests/xfs/099 @@ -37,7 +37,7 @@ _scratch_mkfs_xfs > /dev/null echo "+ mount fs image" _scratch_mount -dblksz="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')" +dblksz=$(_xfs_get_dir_blocksize "$SCRATCH_MNT") nr="$((dblksz / 40))" blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")" leaf_lblk="$((32 * 1073741824 / blksz))" diff --git a/tests/xfs/100 b/tests/xfs/100 index 79da8cb02c..e638b4ba17 100755 --- a/tests/xfs/100 +++ b/tests/xfs/100 @@ -37,7 +37,7 @@ _scratch_mkfs_xfs > /dev/null echo "+ mount fs image" _scratch_mount -dblksz="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')" +dblksz=$(_xfs_get_dir_blocksize "$SCRATCH_MNT") nr="$((dblksz / 12))" blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")" leaf_lblk="$((32 * 1073741824 / blksz))" diff --git a/tests/xfs/101 b/tests/xfs/101 index 64f4705aca..11ed329110 100755 --- a/tests/xfs/101 +++ b/tests/xfs/101 @@ -37,7 +37,7 @@ _scratch_mkfs_xfs > /dev/null echo "+ mount fs image" _scratch_mount -dblksz="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')" +dblksz=$(_xfs_get_dir_blocksize "$SCRATCH_MNT") nr="$((dblksz / 12))" blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")" leaf_lblk="$((32 * 1073741824 / blksz))" diff --git a/tests/xfs/102 b/tests/xfs/102 index 24dce43058..43f4539181 100755 --- a/tests/xfs/102 +++ b/tests/xfs/102 @@ -37,7 +37,7 @@ _scratch_mkfs_xfs > /dev/null echo "+ mount fs image" _scratch_mount -dblksz="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')" +dblksz=$(_xfs_get_dir_blocksize "$SCRATCH_MNT") nr="$((16 * dblksz / 40))" blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")" leaf_lblk="$((32 * 1073741824 / blksz))" diff --git a/tests/xfs/105 b/tests/xfs/105 index 22a8bf9fb0..002a712883 100755 --- a/tests/xfs/105 +++ b/tests/xfs/105 @@ -37,7 +37,7 @@ _scratch_mkfs_xfs > /dev/null echo "+ mount fs image" _scratch_mount -dblksz="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')" +dblksz=$(_xfs_get_dir_blocksize "$SCRATCH_MNT") nr="$((16 * dblksz / 40))" blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")" leaf_lblk="$((32 * 1073741824 / blksz))" diff --git a/tests/xfs/112 b/tests/xfs/112 index bc1ab62895..e2d5932da6 100755 --- a/tests/xfs/112 +++ b/tests/xfs/112 @@ -37,7 +37,7 @@ _scratch_mkfs_xfs > /dev/null echo "+ mount fs image" _scratch_mount -dblksz="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')" +dblksz=$(_xfs_get_dir_blocksize "$SCRATCH_MNT") nr="$((16 * dblksz / 40))" blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")" leaf_lblk="$((32 * 1073741824 / blksz))" diff --git a/tests/xfs/113 b/tests/xfs/113 index e820ed96da..9bb2cd304b 100755 --- a/tests/xfs/113 +++ b/tests/xfs/113 @@ -37,7 +37,7 @@ _scratch_mkfs_xfs > /dev/null echo "+ mount fs image" _scratch_mount -dblksz="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')" +dblksz=$(_xfs_get_dir_blocksize "$SCRATCH_MNT") nr="$((128 * dblksz / 40))" blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")" leaf_lblk="$((32 * 1073741824 / blksz))"