From patchwork Tue Oct 30 18:03:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10661355 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 677A91734 for ; Tue, 30 Oct 2018 18:03:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5B0472624C for ; Tue, 30 Oct 2018 18:03:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E2BB284BD; Tue, 30 Oct 2018 18:03:34 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY 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 DF2F92624C for ; Tue, 30 Oct 2018 18:03:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727710AbeJaC6C (ORCPT ); Tue, 30 Oct 2018 22:58:02 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:52602 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726549AbeJaC6C (ORCPT ); Tue, 30 Oct 2018 22:58:02 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w9UHrdfC138100; Tue, 30 Oct 2018 18:03:31 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : mime-version : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=9A7cgzKHO3nefs/9GNyfedK3ZAXpgF/sTjmW5C4fXDU=; b=cyfm51vJudK+gxhHxQzDA9nTNtHkEYBMF9vPkSte14+c1Y0AXpTPmytIgiDD1ZIk6SP2 ppWH41+jFmuh/SoTCUiV5axnrzGEEdnHFa9MK6lWGiwqHjeOdC3jajeJqWIEJeG3k2jP QMmCCki0r1EtowiPY9GsaSHdnOuXas+ynV1yjP7tkHF7r5wxeGnxTlf4g+WZD6fB95se RH5gkQozPLp6GFC3ddgIHGrRWxUW90BYUi7nm9fM2HY0VqG0wk4NoBIQpO2iiagFKKJO ema1j+CTAgMKz/oeXfrk5q6T2AgEqmhyjFqpfKQXlo/QYj8mAWgNDD3NfaGrb9oLXZC+ fg== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2130.oracle.com with ESMTP id 2nducm2tqu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 30 Oct 2018 18:03:30 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w9UI3UgX009573 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 30 Oct 2018 18:03:30 GMT Received: from abhmp0005.oracle.com (abhmp0005.oracle.com [141.146.116.11]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w9UI3Uho005923; Tue, 30 Oct 2018 18:03:30 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 30 Oct 2018 11:03:29 -0700 Subject: [PATCH 1/3] populate: create leafn dir when populating xfs filesystem From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Tue, 30 Oct 2018 11:03:28 -0700 Message-ID: <154092260885.14882.10714249211090490549.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9062 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=875 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1810300152 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong We've had some problems lately with directories containing a single leafn directory. It turns out that the populate script doesn't create these, so teach it to do so. Signed-off-by: Darrick J. Wong --- common/populate | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/common/populate b/common/populate index 8c08f516..610425f9 100644 --- a/common/populate +++ b/common/populate @@ -136,6 +136,12 @@ _scratch_xfs_populate() { _scratch_mount 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')" + crc="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep crc= | sed -e 's/^.*crc=//g' -e 's/\([0-9]*\).*$/\1/g')" + if [ $crc -eq 1 ]; then + leaf_hdr_size=64 + else + leaf_hdr_size=16 + fi leaf_lblk="$((32 * 1073741824 / blksz))" node_lblk="$((64 * 1073741824 / blksz))" @@ -171,6 +177,10 @@ _scratch_xfs_populate() { echo "+ leaf dir" __populate_create_dir "${SCRATCH_MNT}/S_IFDIR.FMT_LEAF" "$((dblksz / 12))" + # - LEAFN + echo "+ leafn dir" + __populate_create_dir "${SCRATCH_MNT}/S_IFDIR.FMT_LEAFN" "$(( ((dblksz - leaf_hdr_size) / 8) - 3 ))" + # - NODE echo "+ node dir" __populate_create_dir "${SCRATCH_MNT}/S_IFDIR.FMT_NODE" "$((16 * dblksz / 40))" true @@ -433,6 +443,9 @@ __populate_check_xfs_dir() { "leaf") (test "${datab}" -eq 1 && test "${leafb}" -eq 1 && test "${freeb}" -eq 0) || _fail "failed to create ${dtype} dir ino ${inode} datab ${datab} leafb ${leafb} freeb ${freeb}" ;; + "leafn") + _scratch_xfs_db -x -c "inode ${inode}" -c "dblock ${leaf_lblk}" -c "p lhdr.info.hdr.magic" | egrep -q '(0x3dff|0xd2ff)' || _fail "failed to create ${dtype} dir ino ${inode} datab ${datab} leafb ${leafb} freeb ${freeb}" + ;; "node"|"btree") (test "${datab}" -eq 1 && test "${leafb}" -eq 1 && test "${freeb}" -eq 1) || _fail "failed to create ${dtype} dir ino ${inode} datab ${datab} leafb ${leafb} freeb ${freeb}" ;; @@ -508,6 +521,7 @@ _scratch_xfs_populate_check() { inline_dir="$(__populate_find_inode "${SCRATCH_MNT}/S_IFDIR.FMT_INLINE")" block_dir="$(__populate_find_inode "${SCRATCH_MNT}/S_IFDIR.FMT_BLOCK")" leaf_dir="$(__populate_find_inode "${SCRATCH_MNT}/S_IFDIR.FMT_LEAF")" + leafn_dir="$(__populate_find_inode "${SCRATCH_MNT}/S_IFDIR.FMT_LEAFN")" node_dir="$(__populate_find_inode "${SCRATCH_MNT}/S_IFDIR.FMT_NODE")" btree_dir="$(__populate_find_inode "${SCRATCH_MNT}/S_IFDIR.FMT_BTREE")" local_slink="$(__populate_find_inode "${SCRATCH_MNT}/S_IFLNK.FMT_LOCAL")" @@ -533,6 +547,7 @@ _scratch_xfs_populate_check() { __populate_check_xfs_dir "${inline_dir}" "inline" __populate_check_xfs_dir "${block_dir}" "block" __populate_check_xfs_dir "${leaf_dir}" "leaf" + __populate_check_xfs_dir "${leafn_dir}" "leafn" __populate_check_xfs_dir "${node_dir}" "node" __populate_check_xfs_dir "${btree_dir}" "btree" __populate_check_xfs_dformat "${btree_dir}" "btree"