From patchwork Mon Feb 7 06:55:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shin'ichiro Kawasaki X-Patchwork-Id: 12736981 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 55031C4332F for ; Mon, 7 Feb 2022 07:15:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232123AbiBGHPL (ORCPT ); Mon, 7 Feb 2022 02:15:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238419AbiBGG4r (ORCPT ); Mon, 7 Feb 2022 01:56:47 -0500 Received: from esa5.hgst.iphmx.com (esa5.hgst.iphmx.com [216.71.153.144]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14BE6C043184; Sun, 6 Feb 2022 22:56:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1644217006; x=1675753006; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TUe9FJuEf7BWKrxSIxqPYK0eG0nCVdO3BScCuHtRrAI=; b=Ym+CDPpvZ5IzH5rFIajaYudXMjwDKGMM9kHbLc0gXPOVfXP39ZaTAtBu FJJV3sE3yJJXckoyXDPtNJ3a1VbLIHaKRfndfSOY6a9Bm9igWeZrzEWrB Bvkb2r9BMES35OZp6moF8pIWZkszfZyiq0e0fp4TPGi6gAE/Gfb6vXmyo qQAYBepoyawWMTl/9GQo4GQ3aDQWOpxzBMS54ZlOPGYJmTpdVfLWm1CKW 5yaW6Xmb6Mk7aiH8SEMgoA1yZwdLzCruzMjtqb1Prnf8CMcmwRLLHQ/jv w9uH1toR7LwNCS7wlpXsJWiXf/FtADh8oHG7cK4xsi00NjAz6lNOaVzqo A==; X-IronPort-AV: E=Sophos;i="5.88,349,1635177600"; d="scan'208";a="192305057" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 07 Feb 2022 14:55:43 +0800 IronPort-SDR: 2MREi+8FS5XRvb3YPDJ5j/wO3grSW6mB+2WMcjsGBY/pQaU3yzAmoeNbV3Pj2+i2qlaofwk7e8 76r8KZmpc8++CoxqPpiG/eAph4ERjp+COLKBhG0aS1fzXtm7cktlJi7IfF6idMTg7I0IU5k3Af Xr25E67rV/6U+5ljJ1o/8mL+HfKLjoD8gunqZX5FB01CzP9h6KMhdQvgVcsseCvD5bUsEl/RFp O0EXiKOZ2Wdwcs06SSKQwrRVcHqnar9oWn295Y+0sl7TQ0o5/2oWA0c4E7l5h9LcYRjhZR98IT sHQf/4rnabU5nSbbXQa4B3d4 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2022 22:28:45 -0800 IronPort-SDR: e1JXFxzveIsv04C7p2hz7i13/BR9GkuZBcQITXqrNrhqTj1THm4SleplX5Eb1I400adAe5aLTE KaGJNw1tq/uHEGLXPQA8OJuDs5uNz+yK9dKVroSpuebwODf5+DadFfDkZpQ4Vte2NkeuRXhw2S YHdbQsE3cWDcS/RpS3audoHqSV8wA9gEhzhheDfOKnpESz1nP6bwcxooaN2G9HHjmy6/P5qpmq JhK1QOCFpedTTAzZf2DO1IRFK/hFo0Ie+RRfKHvpaHqmLebUGpkZ8IKyLowwQwwgQtrZR+8+hI xXE= WDCIronportException: Internal Received: from shindev.dhcp.fujisawa.hgst.com (HELO shindev.fujisawa.hgst.com) ([10.149.52.173]) by uls-op-cesaip01.wdc.com with ESMTP; 06 Feb 2022 22:55:44 -0800 From: Shin'ichiro Kawasaki To: fstests@vger.kernel.org, linux-btrfs@vger.kernel.org Cc: linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org, Naohiro Aota , Johannes Thumshirn , Damien Le Moal , Shin'ichiro Kawasaki Subject: [PATCH 1/7] common/rc: fix btrfs mixed mode usage in _scratch_mkfs_sized Date: Mon, 7 Feb 2022 15:55:35 +0900 Message-Id: <20220207065541.232685-2-shinichiro.kawasaki@wdc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220207065541.232685-1-shinichiro.kawasaki@wdc.com> References: <20220207065541.232685-1-shinichiro.kawasaki@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org The helper function _scratch_mkfs_sized needs a couple of improvements for btrfs. At first, the function adds --mixed option to mkfs.btrfs when the filesystem size is smaller then 256MiB, but this threshold is no longer correct and it should be 109MiB. Secondly, the --mixed option shall not be specified to mkfs.btrfs for zoned devices, since zoned devices does not allow mixing metadata blocks and data blocks. Suggested-by: Naohiro Aota Signed-off-by: Shin'ichiro Kawasaki --- common/rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/rc b/common/rc index b3289de9..eb2493d1 100644 --- a/common/rc +++ b/common/rc @@ -1075,10 +1075,10 @@ _scratch_mkfs_sized() ;; btrfs) local mixed_opt= - # minimum size that's needed without the mixed option. - # Ref: btrfs-prog: btrfs_min_dev_size() - # Non mixed mode is also the default option. - (( fssize < $((256 * 1024 *1024)) )) && mixed_opt='--mixed' + # Mixed option is required when the filesystem size is small and + # the device is not zoned. Ref: btrfs-progs: btrfs_min_dev_size() + (( fssize < $((109 * 1024 * 1024)) )) && + ! _scratch_btrfs_is_zoned && mixed_opt='--mixed' $MKFS_BTRFS_PROG $MKFS_OPTIONS $mixed_opt -b $fssize $SCRATCH_DEV ;; jfs) From patchwork Mon Feb 7 06:55:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shin'ichiro Kawasaki X-Patchwork-Id: 12736982 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 71AD9C43219 for ; Mon, 7 Feb 2022 07:16:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232144AbiBGHPn (ORCPT ); Mon, 7 Feb 2022 02:15:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238533AbiBGG4v (ORCPT ); Mon, 7 Feb 2022 01:56:51 -0500 Received: from esa5.hgst.iphmx.com (esa5.hgst.iphmx.com [216.71.153.144]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 587C5C043184; Sun, 6 Feb 2022 22:56:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1644217010; x=1675753010; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=d4ENreMGrlKCk5cIjSx96VRXwooXyBj4UXgKGLLw7K0=; b=bLbm+UA3QjgYnLrvUfzpVCVOqHuSFFrjnV0WHRyEoviA95VBwIseOam3 kbFSjmxYyA3zgsPJrJpzzogD4W9/RzCG9Oc7zcHsY6Rl2ulRIZ6+dDu8+ 55NtmkOF5b6ggrelNgxTCR118Nf3O8IbUu5zskWaOnlMDr1UQU7yXqVre BG3OX9ngixALOvpYtirelMyrSFKSpGx6GJst5RsNUj2PqJ7vCS57Y+yto jMD/tf52ZMlDZWBVvYoVw8QORpRk2Hcf4PDEV12vdPz5/fL7hd4eG3ffR Tdb9oIeRiW8uzda2YTXmK7tKx+DCb6IbJbgrl0YBzk6QXOtaCyl8TzEX0 g==; X-IronPort-AV: E=Sophos;i="5.88,349,1635177600"; d="scan'208";a="192305058" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 07 Feb 2022 14:55:44 +0800 IronPort-SDR: AzHJ6gb0GNt+dfP9Spn3Ih6ZsGdIJG2OFuQ7GIAjpgYp7Od9R8Jlis2RbaEsAedP+V2SMkAlr5 mxjLUOeig/KWg7WQsrvQcCPL2b+OQmue51j3IyabafNvtjnySRPxAOX4v+dMEUUYHtITjuCx7z +WRFRVpgO99X7CeKV6/CbDpzG+M3JbENGomnNjFSZGRWkyS5xy0oy7VWFrhuOnfAoshmdcnVJJ JVRZipFVlmpd2Z+Z+wcat+Qi4Izg2LTYtHKUaDYCeqZQvxo4R6/7oiQ9BBtkXoxgIa6fPpJ7oo fCGwkB6kR1w7RhJQgx2N8fOb Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2022 22:28:46 -0800 IronPort-SDR: JlXGmo5R+Rrf+nwIvfXNcaofNNbbLBybjeVFPFgCsGHnHQqYSyTQWkz2QfCwaXHqTznXdh9WZJ UH5PFq8fTrULCAh4VanxcswQOq5VyruByqfZHz0t1fqMLU9koybaBuJLLFmkrA92+s+IhzPWPp vyJFcsEUAcXuTMxQYJOqxEuPRyjbpvY4/9fyyxj+hqeW3MadbQ0Np+goQYBKxvf3fBQj77Ukr6 9TojSxEw+WqoshTtevL/qkZ4LYscIlyAeoRGS299903p1Yz4d/rDKzeg1EeRgVoPv9OMmJly7Q Ke0= WDCIronportException: Internal Received: from shindev.dhcp.fujisawa.hgst.com (HELO shindev.fujisawa.hgst.com) ([10.149.52.173]) by uls-op-cesaip01.wdc.com with ESMTP; 06 Feb 2022 22:55:45 -0800 From: Shin'ichiro Kawasaki To: fstests@vger.kernel.org, linux-btrfs@vger.kernel.org Cc: linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org, Naohiro Aota , Johannes Thumshirn , Damien Le Moal , Shin'ichiro Kawasaki Subject: [PATCH 2/7] generic/{171,172,173,174,204}: check _scratch_mkfs_sized return code Date: Mon, 7 Feb 2022 15:55:36 +0900 Message-Id: <20220207065541.232685-3-shinichiro.kawasaki@wdc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220207065541.232685-1-shinichiro.kawasaki@wdc.com> References: <20220207065541.232685-1-shinichiro.kawasaki@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org The test cases generic/{171,172,173,174,204} call _scratch_mkfs before _scratch_mkfs_sized, and they do not check return code of _scratch_mkfs_sized. Even if _scratch_mkfs_sized failed, _scratch_mount after it cannot detect the sized mkfs failure because _scratch_mkfs already created a file system on the device. This results in unexpected test condition of the test cases. To avoid the unexpected test condition, check return code of _scratch_mkfs_sized in the test cases. Suggested-by: Naohiro Aota Signed-off-by: Shin'ichiro Kawasaki Reviewed-by: Darrick J. Wong --- tests/generic/171 | 2 +- tests/generic/172 | 2 +- tests/generic/173 | 2 +- tests/generic/174 | 2 +- tests/generic/204 | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/generic/171 b/tests/generic/171 index fb2a6f14..f823a454 100755 --- a/tests/generic/171 +++ b/tests/generic/171 @@ -42,7 +42,7 @@ sz_bytes=$((nr_blks * 8 * blksz)) if [ $sz_bytes -lt $((32 * 1048576)) ]; then sz_bytes=$((32 * 1048576)) fi -_scratch_mkfs_sized $sz_bytes >> $seqres.full 2>&1 +_scratch_mkfs_sized $sz_bytes >> $seqres.full 2>&1 || _fail "mkfs failed" _scratch_mount >> $seqres.full 2>&1 rm -rf $testdir mkdir $testdir diff --git a/tests/generic/172 b/tests/generic/172 index ab5122fa..383824b9 100755 --- a/tests/generic/172 +++ b/tests/generic/172 @@ -40,7 +40,7 @@ umount $SCRATCH_MNT file_size=$((768 * 1024 * 1024)) fs_size=$((1024 * 1024 * 1024)) -_scratch_mkfs_sized $fs_size >> $seqres.full 2>&1 +_scratch_mkfs_sized $fs_size >> $seqres.full 2>&1 || _fail "mkfs failed" _scratch_mount >> $seqres.full 2>&1 rm -rf $testdir mkdir $testdir diff --git a/tests/generic/173 b/tests/generic/173 index 0eb313e2..e1493278 100755 --- a/tests/generic/173 +++ b/tests/generic/173 @@ -42,7 +42,7 @@ sz_bytes=$((nr_blks * 8 * blksz)) if [ $sz_bytes -lt $((32 * 1048576)) ]; then sz_bytes=$((32 * 1048576)) fi -_scratch_mkfs_sized $sz_bytes >> $seqres.full 2>&1 +_scratch_mkfs_sized $sz_bytes >> $seqres.full 2>&1 || _fail "mkfs failed" _scratch_mount >> $seqres.full 2>&1 rm -rf $testdir mkdir $testdir diff --git a/tests/generic/174 b/tests/generic/174 index 1505453e..c7a177b8 100755 --- a/tests/generic/174 +++ b/tests/generic/174 @@ -43,7 +43,7 @@ sz_bytes=$((nr_blks * 8 * blksz)) if [ $sz_bytes -lt $((32 * 1048576)) ]; then sz_bytes=$((32 * 1048576)) fi -_scratch_mkfs_sized $sz_bytes >> $seqres.full 2>&1 +_scratch_mkfs_sized $sz_bytes >> $seqres.full 2>&1 || _fail "mkfs failed" _scratch_mount >> $seqres.full 2>&1 rm -rf $testdir mkdir $testdir diff --git a/tests/generic/204 b/tests/generic/204 index a3dabb71..b5deb443 100755 --- a/tests/generic/204 +++ b/tests/generic/204 @@ -35,7 +35,8 @@ _scratch_mkfs 2> /dev/null | _filter_mkfs 2> $tmp.mkfs > /dev/null [ $FSTYP = "xfs" ] && MKFS_OPTIONS="$MKFS_OPTIONS -l size=16m -i maxpct=50" SIZE=`expr 115 \* 1024 \* 1024` -_scratch_mkfs_sized $SIZE $dbsize 2> /dev/null > $tmp.mkfs.raw +_scratch_mkfs_sized $SIZE $dbsize 2> /dev/null > $tmp.mkfs.raw \ + || _fail "mkfs failed" cat $tmp.mkfs.raw | _filter_mkfs 2> $tmp.mkfs > /dev/null _scratch_mount From patchwork Mon Feb 7 06:55:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shin'ichiro Kawasaki X-Patchwork-Id: 12736988 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 9A6DAC4167D for ; Mon, 7 Feb 2022 07:16:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236317AbiBGHPt (ORCPT ); Mon, 7 Feb 2022 02:15:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238449AbiBGG4t (ORCPT ); Mon, 7 Feb 2022 01:56:49 -0500 Received: from esa5.hgst.iphmx.com (esa5.hgst.iphmx.com [216.71.153.144]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54309C043181; Sun, 6 Feb 2022 22:56:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1644217009; x=1675753009; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dqFAptI4CAvK6M8wR+plx0XzaNREix5nWvG4orfRMAg=; b=SIq6/T+JoZShEbAkQdqJFxjnvH6upGztAaGudqDyfUY2xg1eZTx9ZdjL r0Vcp9YW0AytAVzyrlYVMMkgDDu9rfpKoCPGo7OQHuhqhsLPZnmU6XDkB L+zCHKxYjRdMFYt+3viXYSKZAlKMX1giK8MCXusaYHM0L/DxvCylMjihf 0zy4gXnYhOfFq/QytwnmxWcr76gZFyv1vN+CeiftB16d0GKXylsRG8EJA Wlud065/gZn/u/yarzM8T3MMoLMEX19ghLJqQU+PdV+OtmDqfuSwrzY/Y DFUuAE2qxxnrHYavaAVvhQqFqC6sk7VIj2IYWNYbpOgcyYdvxjCejyyso A==; X-IronPort-AV: E=Sophos;i="5.88,349,1635177600"; d="scan'208";a="192305059" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 07 Feb 2022 14:55:46 +0800 IronPort-SDR: Ogu9eFOyBtg9dM6EsmEJAQVPIZxWwTlEWDq8aR6bJLyHxQPyx6S5wpqZiXuVZz5gCks5KQizTI xK0SPj/lvtkaadNLDETbX6EMGyv5jrdvEwjVTLBcHWWnuxGLa5M1DWzhRspiD4hqCZ7ZJmhqKA y9E2Ix6PRpzTvqo1z7Yot3Q0raSNY7w3hZ/Y/50BYaZfEIIxqjnVvHHvMPuljyNByWGsdtRgBN m/yex7j3NjgODPN23en4Lfjk5QFIWPgKdpZPva/nA1HGZZ7mu6wbu+7XlM29fA0o77oTgzk7f8 Zfwo2yl/1iLoNjPs9cQkfMKD Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2022 22:28:48 -0800 IronPort-SDR: 7rp953d7QjEFNKLqgIeM3C8qjiiemF4hvgK0BB+vqRPd2D0tvrzCj4GySzcfK3s/k2xLDs/DLr H4bFH1Kze61TgAZdKyKVCZYvLuvbyQuPKt4TKazw0F5hPc94koKnsXP1igH9/dneEA2S0NUghG 7kzZODIulF2osHtXH6vDK4vemqWEjjc/GrVJ8x0ECOAiuEPukD7r8PUafasNNW1AVy4ILg8Rh5 iBhYWfq61Vz05rYIcHI1pBoUn7BJd/b2z4XN79NKZ0SpJuLO55FsLvjn5b5aIPdOoLHE2j9jcb ECU= WDCIronportException: Internal Received: from shindev.dhcp.fujisawa.hgst.com (HELO shindev.fujisawa.hgst.com) ([10.149.52.173]) by uls-op-cesaip01.wdc.com with ESMTP; 06 Feb 2022 22:55:46 -0800 From: Shin'ichiro Kawasaki To: fstests@vger.kernel.org, linux-btrfs@vger.kernel.org Cc: linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org, Naohiro Aota , Johannes Thumshirn , Damien Le Moal , Shin'ichiro Kawasaki Subject: [PATCH 3/7] ext4/021: check _scratch_mkfs_sized return code Date: Mon, 7 Feb 2022 15:55:37 +0900 Message-Id: <20220207065541.232685-4-shinichiro.kawasaki@wdc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220207065541.232685-1-shinichiro.kawasaki@wdc.com> References: <20220207065541.232685-1-shinichiro.kawasaki@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org The test cases ext4/021 calls _scratch_mkfs before _scratch_mkfs_sized, and does not check return code of _scratch_mkfs_sized. Even if _scratch_mkfs_sized failed, _scratch_mount after it cannot detect the sized mkfs failure because _scratch_mkfs already created a file system on the device. This results in unexpected test condition. To avoid the unexpected test condition, check return code of _scratch_mkfs_sized. Suggested-by: Naohiro Aota Signed-off-by: Shin'ichiro Kawasaki --- tests/ext4/021 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ext4/021 b/tests/ext4/021 index 62768c60..a9277abf 100755 --- a/tests/ext4/021 +++ b/tests/ext4/021 @@ -24,7 +24,7 @@ _scratch_unmount # With 4k block size, this amounts to 10M FS instance. fssize=$((2560 * $blocksize)) -_scratch_mkfs_sized $fssize >> $seqres.full 2>&1 +_scratch_mkfs_sized $fssize >> $seqres.full 2>&1 || _fail "mkfs failed" _require_metadata_journaling $SCRATCH_DEV offset=0 From patchwork Mon Feb 7 06:55:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shin'ichiro Kawasaki X-Patchwork-Id: 12736986 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 68190C4167B for ; Mon, 7 Feb 2022 07:16:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234784AbiBGHPr (ORCPT ); Mon, 7 Feb 2022 02:15:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238464AbiBGG4v (ORCPT ); Mon, 7 Feb 2022 01:56:51 -0500 Received: from esa5.hgst.iphmx.com (esa5.hgst.iphmx.com [216.71.153.144]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 58744C043181; Sun, 6 Feb 2022 22:56:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1644217010; x=1675753010; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pgEGgT9hg08/vaCtBuyGS4ntdQzvuj9kMy+3OGsW+xU=; b=UNBWiQb0iYjf5uB9pqzP8Kgkm6F/ezPGtFNVGJpwRjU3sIKHGXvS0ORx JCIfT5ldoyqchXfiMO6JVnLat4hYGtJ6YBrVkYXqlq95l1iBstl9Pv33v oOEW+wgdzTdorxsUFDHoTBC0aJo0QSAPrQ5i7s16K1/oKbUaxieOdYZny ev6QU0rSgMiPpXZbSicQeAZLnPgjsi4XcTNuleEc9EJK7xYCN45z5CdlF 7Fqr4Vgi19bt+/Mjpoqj7cfb02Mx8n15VadZvTpQ7crzA1JHCTuA2w/Bo S9ekVXV17vujGLseZWBv2W+CnXxNgAWyLC5WJSy9RDa6jPDWI0KROGCf9 g==; X-IronPort-AV: E=Sophos;i="5.88,349,1635177600"; d="scan'208";a="192305061" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 07 Feb 2022 14:55:47 +0800 IronPort-SDR: /aB4ytln02CZUgc4RubdiLHgmyiTerkBvl3wKKHIS/iafNJSyvjCzF3gbxScKYjgoz9WJxwcrt cdpSQZU4VzhKMw+FoeEc1LbqCxI997cV7B2N0Hm4/1XEr0F24x0qqJ5Mda+R7ovIyC76p1hQ5C 1nqUW1Yd6OU93zQRiDHvZn3L2bLmA32FxVKrflpWNuLO/ZWbuShSNGsa8csmXJgW/U6xuoHao+ 3tIG3TsXzMNIpHsUYgpqpd0Oo/ASrVjSB+W29QE9uoDSVJBIQOOWLtIVMj/5Cew6U2zDKl147t EcgtyBbVIblc1+k1+QkkfsIA Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2022 22:28:49 -0800 IronPort-SDR: +GbqTEDv8vqwEHFBI0kG4ad3Y+S7Hkd8lx5ZIIeer2eJHlutG2M+lJ3kSTuSfsxJtkG3ytazEC dDWxeRsclxFGn8gYTom9BCeIRR4tkrYiFwcco5mtjU6nGqTb5Na5uy6ZbHToe58yn7nTaksZ6l N5RF4//CEMvGc9BMyv5W/67hyeOurydyKXXv0ZCz8OxqQ3sIA5Zn5cyu6D5kJOEMBcdOqSa48F HhjVVlc1M8P8KU1nhHiCQIuKUqh5Ov9OJ4OdefCHaL60A3SwhQ/1rbAXkDOvVuQcMTrV5fdZJ1 Gyc= WDCIronportException: Internal Received: from shindev.dhcp.fujisawa.hgst.com (HELO shindev.fujisawa.hgst.com) ([10.149.52.173]) by uls-op-cesaip01.wdc.com with ESMTP; 06 Feb 2022 22:55:48 -0800 From: Shin'ichiro Kawasaki To: fstests@vger.kernel.org, linux-btrfs@vger.kernel.org Cc: linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org, Naohiro Aota , Johannes Thumshirn , Damien Le Moal , Shin'ichiro Kawasaki Subject: [PATCH 4/7] xfs/015: check _scratch_mkfs_sized return code Date: Mon, 7 Feb 2022 15:55:38 +0900 Message-Id: <20220207065541.232685-5-shinichiro.kawasaki@wdc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220207065541.232685-1-shinichiro.kawasaki@wdc.com> References: <20220207065541.232685-1-shinichiro.kawasaki@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org The test cases xfs/015 calls _scratch_mkfs before _scratch_mkfs_sized, and does not check return code of _scratch_mkfs_sized. Even if _scratch_mkfs_sized failed, _scratch_mount after it cannot detect the sized mkfs failure because _scratch_mkfs already created a file system on the device. This results in unexpected test condition. To avoid the unexpected test condition, check return code of _scratch_mkfs_sized. Suggested-by: Naohiro Aota Signed-off-by: Shin'ichiro Kawasaki Reviewed-by: Darrick J. Wong --- tests/xfs/015 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/xfs/015 b/tests/xfs/015 index 86fa6336..2bb7b8d5 100755 --- a/tests/xfs/015 +++ b/tests/xfs/015 @@ -43,7 +43,7 @@ _scratch_mount _require_fs_space $SCRATCH_MNT 131072 _scratch_unmount -_scratch_mkfs_sized $((32 * 1024 * 1024)) > $tmp.mkfs.raw +_scratch_mkfs_sized $((32 * 1024 * 1024)) > $tmp.mkfs.raw || _fail "mkfs failed" cat $tmp.mkfs.raw | _filter_mkfs >$seqres.full 2>$tmp.mkfs # get original data blocks number and agcount . $tmp.mkfs From patchwork Mon Feb 7 06:55:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shin'ichiro Kawasaki X-Patchwork-Id: 12736987 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 52E6CC4321E for ; Mon, 7 Feb 2022 07:16:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235669AbiBGHPs (ORCPT ); Mon, 7 Feb 2022 02:15:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238633AbiBGG45 (ORCPT ); Mon, 7 Feb 2022 01:56:57 -0500 Received: from esa5.hgst.iphmx.com (esa5.hgst.iphmx.com [216.71.153.144]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69A60C043185; Sun, 6 Feb 2022 22:56:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1644217015; x=1675753015; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jrDb7WChrcBycb7ZvR9SK9nmp/V2FKFvMxreqrtzbZQ=; b=rORWNpV+r6DwTWHBnwgYAubljajOABCd4JirmUxQfqSXlhcPiXyDzk09 6rSJeY1RlBicqIumcHY3QEJg7VAv2yewYd5La8nHENUj4OZJrdil3kUay DA4Mc39eM2M172WF48I1N2VnTUSchJJ6CKxxq70tS8IxdNe/lHBMIaylx aWmWHAje1jdJU2UfsdroFu49jkdR8tauVzrjtUxm/64FpcsQNl2A867i4 G9/nsyydtp9JKMNZut8fULLEgYYXF47074BuwT4CJqMwQKDAsYBffP04M P52UoL8ERtIAxMhrccLhFQw2RYi9ad224WWAE6gqOwIRxJ6ssKOerwQT5 w==; X-IronPort-AV: E=Sophos;i="5.88,349,1635177600"; d="scan'208";a="192305062" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 07 Feb 2022 14:55:49 +0800 IronPort-SDR: kislRi1adCRXH366oXDUF8AV51NHPvzAF1H2TlnzwEe35vjX5Jpmy4ocuYZjjTr9aGTV4lOIgu ggPnWt0DTf/WCm8zkRt9038HijVfAyhttUM91nZNs5Ah4zu6yY8s+ZzpppTd3qNRuIviiWY/yE IqO66ONwdv2xfdUV8z6GLTJ8//u6ZRQoKGJYP3/NEDSSfFrMOMLEeJP0/yruARHKUTE8zAK8yN IKUAkKuxMsXaBWpHz44QIl0v2wyjqA4W2aYOzxucuD73II4tjIZjakENQs68wVBvptGZmrLKuy OJ1UcnaF5i/YZNPrAwuN+sR8 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2022 22:28:50 -0800 IronPort-SDR: 9xLGLphWiZSQ1s9csUnQEA7JvByavxivlnavIcsiMtXkYphGubftaKu3oDEuqXT+PA++EF1cth xHT8dIlSt8CCxxJEiyFLd8q5H+EhVUYsCLg889LX9g53i/JkJWgOa3cAhHptp28JN6AUib1nOF qkSlOiYMnYTCNqPoJqtBsD05GPOQGx9zi9Ou+wztlUla555IvM19VPX3h+sa6SKnpIEbEnbpk6 0BcIL7BSQVurfVT+Hd2RifUcXzBfzf2gVHlZFiX4brZY4UE2EptJdCbEupOeWRP8KjD8bRAT/T HGY= WDCIronportException: Internal Received: from shindev.dhcp.fujisawa.hgst.com (HELO shindev.fujisawa.hgst.com) ([10.149.52.173]) by uls-op-cesaip01.wdc.com with ESMTP; 06 Feb 2022 22:55:49 -0800 From: Shin'ichiro Kawasaki To: fstests@vger.kernel.org, linux-btrfs@vger.kernel.org Cc: linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org, Naohiro Aota , Johannes Thumshirn , Damien Le Moal , Shin'ichiro Kawasaki Subject: [PATCH 5/7] common: rename _filter_mkfs to _xfs_filter_mkfs Date: Mon, 7 Feb 2022 15:55:39 +0900 Message-Id: <20220207065541.232685-6-shinichiro.kawasaki@wdc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220207065541.232685-1-shinichiro.kawasaki@wdc.com> References: <20220207065541.232685-1-shinichiro.kawasaki@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org The helper function works only for xfs and used only for xfs except generic/204. Rename the function to clearly indicate that the function is only for xfs. Suggested-by: Naohiro Aota Signed-off-by: Shin'ichiro Kawasaki --- common/attr | 2 +- common/filter | 2 +- common/xfs | 2 +- tests/generic/204 | 4 ++-- tests/xfs/004 | 2 +- tests/xfs/007 | 2 +- tests/xfs/010 | 2 +- tests/xfs/013 | 2 +- tests/xfs/015 | 2 +- tests/xfs/016 | 2 +- tests/xfs/029 | 2 +- tests/xfs/030 | 2 +- tests/xfs/031 | 6 +++--- tests/xfs/033 | 4 ++-- tests/xfs/041 | 2 +- tests/xfs/044 | 2 +- tests/xfs/050 | 2 +- tests/xfs/052 | 2 +- tests/xfs/058 | 2 +- tests/xfs/067 | 2 +- tests/xfs/070 | 2 +- tests/xfs/071 | 2 +- tests/xfs/073 | 2 +- tests/xfs/076 | 2 +- tests/xfs/078 | 2 +- tests/xfs/092 | 2 +- tests/xfs/104 | 6 +++--- tests/xfs/108 | 2 +- tests/xfs/109 | 2 +- tests/xfs/110 | 2 +- tests/xfs/111 | 2 +- tests/xfs/144 | 2 +- tests/xfs/153 | 2 +- tests/xfs/163 | 4 ++-- tests/xfs/168 | 6 +++--- tests/xfs/176 | 2 +- tests/xfs/178 | 2 +- tests/xfs/186 | 2 +- tests/xfs/189 | 2 +- tests/xfs/250 | 2 +- tests/xfs/259 | 2 +- tests/xfs/276 | 2 +- tests/xfs/279 | 2 +- tests/xfs/288 | 2 +- tests/xfs/292 | 4 ++-- tests/xfs/299 | 4 ++-- tests/xfs/335 | 2 +- tests/xfs/336 | 2 +- tests/xfs/337 | 2 +- tests/xfs/341 | 2 +- tests/xfs/342 | 2 +- tests/xfs/443 | 2 +- tests/xfs/448 | 2 +- tests/xfs/490 | 2 +- tests/xfs/502 | 2 +- tests/xfs/513 | 2 +- tests/xfs/530 | 2 +- tests/xfs/533 | 2 +- 58 files changed, 69 insertions(+), 69 deletions(-) diff --git a/common/attr b/common/attr index 35682d7c..964c790a 100644 --- a/common/attr +++ b/common/attr @@ -13,7 +13,7 @@ _acl_get_max() # CRC format filesystems have much larger ACL counts. The actual # number is into the thousands, but testing that meany takes too # long, so just test well past the old limit of 25. - $XFS_INFO_PROG $TEST_DIR | _filter_mkfs > /dev/null 2> $tmp.info + $XFS_INFO_PROG $TEST_DIR | _xfs_filter_mkfs > /dev/null 2> $tmp.info . $tmp.info rm $tmp.info if [ $_fs_has_crcs -eq 0 ]; then diff --git a/common/filter b/common/filter index c3db7a56..24fd0650 100644 --- a/common/filter +++ b/common/filter @@ -117,7 +117,7 @@ _filter_date() # prints filtered output on stdout, values (use eval) on stderr # Non XFS filesystems always return a 4k block size and a 256 byte inode. -_filter_mkfs() +_xfs_filter_mkfs() { case $FSTYP in xfs) diff --git a/common/xfs b/common/xfs index 713e9fe7..3435c706 100644 --- a/common/xfs +++ b/common/xfs @@ -832,7 +832,7 @@ _require_scratch_xfs_shrink() _require_scratch _require_command "$XFS_GROWFS_PROG" xfs_growfs - _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs >/dev/null + _scratch_mkfs_xfs | _xfs_filter_mkfs 2>$tmp.mkfs >/dev/null . $tmp.mkfs _scratch_mount # here just to check if kernel supports, no need do more extra work diff --git a/tests/generic/204 b/tests/generic/204 index b5deb443..40d524d1 100755 --- a/tests/generic/204 +++ b/tests/generic/204 @@ -25,7 +25,7 @@ _supported_fs generic _require_scratch # get the block size first -_scratch_mkfs 2> /dev/null | _filter_mkfs 2> $tmp.mkfs > /dev/null +_scratch_mkfs 2> /dev/null | _xfs_filter_mkfs 2> $tmp.mkfs > /dev/null . $tmp.mkfs # For xfs, we need to handle the different default log sizes that different @@ -37,7 +37,7 @@ _scratch_mkfs 2> /dev/null | _filter_mkfs 2> $tmp.mkfs > /dev/null SIZE=`expr 115 \* 1024 \* 1024` _scratch_mkfs_sized $SIZE $dbsize 2> /dev/null > $tmp.mkfs.raw \ || _fail "mkfs failed" -cat $tmp.mkfs.raw | _filter_mkfs 2> $tmp.mkfs > /dev/null +cat $tmp.mkfs.raw | _xfs_filter_mkfs 2> $tmp.mkfs > /dev/null _scratch_mount # Source $tmp.mkfs to get geometry diff --git a/tests/xfs/004 b/tests/xfs/004 index f18316b3..5e83fff9 100755 --- a/tests/xfs/004 +++ b/tests/xfs/004 @@ -21,7 +21,7 @@ _cleanup() _populate_scratch() { echo "=== mkfs output ===" >>$seqres.full - _scratch_mkfs_xfs | tee -a $seqres.full | _filter_mkfs 2>$tmp.mkfs + _scratch_mkfs_xfs | tee -a $seqres.full | _xfs_filter_mkfs 2>$tmp.mkfs . $tmp.mkfs _scratch_mount # This test looks at specific behaviors of the xfs_db freesp command, diff --git a/tests/xfs/007 b/tests/xfs/007 index 4f864100..33a857e8 100755 --- a/tests/xfs/007 +++ b/tests/xfs/007 @@ -19,7 +19,7 @@ _supported_fs xfs _require_scratch _require_xfs_quota -_scratch_mkfs_xfs | _filter_mkfs > /dev/null 2> $tmp.mkfs +_scratch_mkfs_xfs | _xfs_filter_mkfs > /dev/null 2> $tmp.mkfs . $tmp.mkfs do_test() diff --git a/tests/xfs/010 b/tests/xfs/010 index 16c08b85..badac7c0 100755 --- a/tests/xfs/010 +++ b/tests/xfs/010 @@ -87,7 +87,7 @@ _require_scratch _require_xfs_mkfs_finobt _require_xfs_finobt -_scratch_mkfs_xfs "-m crc=1,finobt=1 -d agcount=2" | _filter_mkfs 2>$seqres.full +_scratch_mkfs_xfs "-m crc=1,finobt=1 -d agcount=2" | _xfs_filter_mkfs 2>$seqres.full # sparsely populate the fs such that we create records with free inodes _scratch_mount diff --git a/tests/xfs/013 b/tests/xfs/013 index 2d005753..dc39ffd6 100755 --- a/tests/xfs/013 +++ b/tests/xfs/013 @@ -89,7 +89,7 @@ _require_xfs_finobt _require_command "$KILLALL_PROG" killall _scratch_mkfs_xfs "-m crc=1,finobt=1 -d agcount=2" | \ - _filter_mkfs 2>> $seqres.full + _xfs_filter_mkfs 2>> $seqres.full _scratch_mount COUNT=20000 # number of files per directory diff --git a/tests/xfs/015 b/tests/xfs/015 index 2bb7b8d5..72842b38 100755 --- a/tests/xfs/015 +++ b/tests/xfs/015 @@ -44,7 +44,7 @@ _require_fs_space $SCRATCH_MNT 131072 _scratch_unmount _scratch_mkfs_sized $((32 * 1024 * 1024)) > $tmp.mkfs.raw || _fail "mkfs failed" -cat $tmp.mkfs.raw | _filter_mkfs >$seqres.full 2>$tmp.mkfs +cat $tmp.mkfs.raw | _xfs_filter_mkfs >$seqres.full 2>$tmp.mkfs # get original data blocks number and agcount . $tmp.mkfs _scratch_mount diff --git a/tests/xfs/016 b/tests/xfs/016 index 6337bb1f..e8094476 100755 --- a/tests/xfs/016 +++ b/tests/xfs/016 @@ -66,7 +66,7 @@ _init() _scratch_mkfs_xfs $force_opts >$tmp.mkfs0 2>&1 [ $? -ne 0 ] && \ _notrun "Cannot mkfs for this test using MKFS_OPTIONS specified" - _filter_mkfs <$tmp.mkfs0 >/dev/null 2>$tmp.mkfs + _xfs_filter_mkfs <$tmp.mkfs0 >/dev/null 2>$tmp.mkfs . $tmp.mkfs [ $logsunit -ne 0 ] && \ _notrun "Cannot run this test using log MKFS_OPTIONS specified" diff --git a/tests/xfs/029 b/tests/xfs/029 index 6e8aa4db..a3fb9cfc 100755 --- a/tests/xfs/029 +++ b/tests/xfs/029 @@ -36,7 +36,7 @@ _supported_fs xfs _require_scratch echo -_scratch_mkfs_xfs | _filter_mkfs 2>/dev/null +_scratch_mkfs_xfs | _xfs_filter_mkfs 2>/dev/null echo _scratch_xfs_logprint | filter_logprint diff --git a/tests/xfs/030 b/tests/xfs/030 index 201a9015..62066d06 100755 --- a/tests/xfs/030 +++ b/tests/xfs/030 @@ -83,7 +83,7 @@ $here/src/devzero -v -1 -n "$clear" $SCRATCH_DEV >/dev/null # now kick off the real repair test... # -_scratch_mkfs_xfs $DSIZE | _filter_mkfs 2>$tmp.mkfs +_scratch_mkfs_xfs $DSIZE | _xfs_filter_mkfs 2>$tmp.mkfs . $tmp.mkfs _check_ag 0 _check_ag -1 diff --git a/tests/xfs/031 b/tests/xfs/031 index 6e3813da..e6bbc0d4 100755 --- a/tests/xfs/031 +++ b/tests/xfs/031 @@ -82,20 +82,20 @@ echo "$MKFS_OPTIONS" | grep -q "rtinherit" && \ _create_proto 0 echo "=== one entry (shortform)" _scratch_mkfs_xfs -p $tmp.proto >$tmp.mkfs0 2>&1 -_filter_mkfs <$tmp.mkfs0 >/dev/null 2>$tmp.mkfs +_xfs_filter_mkfs <$tmp.mkfs0 >/dev/null 2>$tmp.mkfs . $tmp.mkfs _check_repair # block-form root directory & repeat _create_proto 20 echo "=== twenty entries (block form)" -_scratch_mkfs_xfs -p $tmp.proto | _filter_mkfs >/dev/null 2>&1 +_scratch_mkfs_xfs -p $tmp.proto | _xfs_filter_mkfs >/dev/null 2>&1 _check_repair # leaf-form root directory & repeat _create_proto 1000 echo "=== thousand entries (leaf form)" -_scratch_mkfs_xfs -p $tmp.proto | _filter_mkfs >/dev/null 2>&1 +_scratch_mkfs_xfs -p $tmp.proto | _xfs_filter_mkfs >/dev/null 2>&1 _check_repair # success, all done diff --git a/tests/xfs/033 b/tests/xfs/033 index d47da0d6..61ae4004 100755 --- a/tests/xfs/033 +++ b/tests/xfs/033 @@ -55,10 +55,10 @@ _require_scratch _require_no_large_scratch_dev # devzero blows away 512byte blocks, so make 512byte inodes (at least) -_scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs >/dev/null +_scratch_mkfs_xfs | _xfs_filter_mkfs 2>$tmp.mkfs >/dev/null . $tmp.mkfs if [ $isize -lt 512 ]; then - _scratch_mkfs_xfs -isize=512 | _filter_mkfs 2>$tmp.mkfs >/dev/null + _scratch_mkfs_xfs -isize=512 | _xfs_filter_mkfs 2>$tmp.mkfs >/dev/null . $tmp.mkfs fi diff --git a/tests/xfs/041 b/tests/xfs/041 index 05de5578..135ed410 100755 --- a/tests/xfs/041 +++ b/tests/xfs/041 @@ -41,7 +41,7 @@ _do_die_on_error=message_only agsize=32 echo -n "Make $agsize megabyte filesystem on SCRATCH_DEV and mount... " _scratch_mkfs_xfs -dsize=${agsize}m,agcount=1 2>&1 >/dev/null || _fail "mkfs failed" -bsize=`_scratch_mkfs_xfs -dsize=${agsize}m,agcount=1 2>&1 | _filter_mkfs 2>&1 \ +bsize=`_scratch_mkfs_xfs -dsize=${agsize}m,agcount=1 2>&1 | _xfs_filter_mkfs 2>&1 \ | perl -ne 'if (/dbsize=(\d+)/) {print $1;}'` onemeginblocks=`expr 1048576 / $bsize` _scratch_mount diff --git a/tests/xfs/044 b/tests/xfs/044 index e66c0cb3..8ffd2af4 100755 --- a/tests/xfs/044 +++ b/tests/xfs/044 @@ -79,7 +79,7 @@ lsize=16777216 _scratch_mkfs_xfs -lsize=$lsize,version=$lversion >$tmp.mkfs0 2>&1 [ $? -ne 0 ] && \ _notrun "Cannot mkfs for this test using MKFS_OPTIONS specified" -_filter_mkfs <$tmp.mkfs0 2>$tmp.mkfs1 +_xfs_filter_mkfs <$tmp.mkfs0 2>$tmp.mkfs1 . $tmp.mkfs1 [ $lversion -ne 1 ] && \ _notrun "Cannot run this test yet using MKFS_OPTIONS specified" diff --git a/tests/xfs/050 b/tests/xfs/050 index 1847611b..3556c85e 100755 --- a/tests/xfs/050 +++ b/tests/xfs/050 @@ -65,7 +65,7 @@ _filter_and_check_blks() _exercise() { - _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs + _scratch_mkfs_xfs | _xfs_filter_mkfs 2>$tmp.mkfs cat $tmp.mkfs >>$seqres.full # keep the blocksize and data size for dd later diff --git a/tests/xfs/052 b/tests/xfs/052 index 75761022..e4c7ee6c 100755 --- a/tests/xfs/052 +++ b/tests/xfs/052 @@ -34,7 +34,7 @@ _require_nobody # setup a default run _qmount_option uquota -_scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs +_scratch_mkfs_xfs | _xfs_filter_mkfs 2>$tmp.mkfs cat $tmp.mkfs >>$seqres.full chmod a+w $seqres.full # arbitrary users will write here diff --git a/tests/xfs/058 b/tests/xfs/058 index 8751a7ac..0f87ec3c 100755 --- a/tests/xfs/058 +++ b/tests/xfs/058 @@ -22,7 +22,7 @@ _require_xfs_db_command "fuzz" rm -f "$seqres.full" echo "Format" -_scratch_mkfs | _filter_mkfs 2>$tmp.mkfs >> "$seqres.full" +_scratch_mkfs | _xfs_filter_mkfs 2>$tmp.mkfs >> "$seqres.full" source $tmp.mkfs do_xfs_db() diff --git a/tests/xfs/067 b/tests/xfs/067 index 3dc381bb..c733d761 100755 --- a/tests/xfs/067 +++ b/tests/xfs/067 @@ -22,7 +22,7 @@ _require_scratch # set up fs for 1K inodes isize=0 -_scratch_mkfs_xfs | _filter_mkfs >$seqres.full 2>$tmp.mkfs +_scratch_mkfs_xfs | _xfs_filter_mkfs >$seqres.full 2>$tmp.mkfs [ $? -eq 0 ] && source $tmp.mkfs if [ "$isize" -lt 1024 ]; then _scratch_mkfs_xfs -i size=1024 >>$seqres.full \ diff --git a/tests/xfs/070 b/tests/xfs/070 index 43ca7f84..9db518d7 100755 --- a/tests/xfs/070 +++ b/tests/xfs/070 @@ -76,7 +76,7 @@ _supported_fs xfs _require_scratch_nocheck _require_command "$KILLALL_PROG" killall -_scratch_mkfs | _filter_mkfs > /dev/null 2> $tmp.mkfs +_scratch_mkfs | _xfs_filter_mkfs > /dev/null 2> $tmp.mkfs test "${PIPESTATUS[0]}" -eq 0 || _fail "mkfs failed" . $tmp.mkfs # import agcount diff --git a/tests/xfs/071 b/tests/xfs/071 index 8373878a..9b425d9f 100755 --- a/tests/xfs/071 +++ b/tests/xfs/071 @@ -81,7 +81,7 @@ _supported_fs xfs [ -n "$XFS_IO_PROG" ] || _notrun "xfs_io executable not found" _require_scratch -_scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs +_scratch_mkfs_xfs | _xfs_filter_mkfs 2>$tmp.mkfs . $tmp.mkfs echo _scratch_mount diff --git a/tests/xfs/073 b/tests/xfs/073 index c7616b9e..d1b97313 100755 --- a/tests/xfs/073 +++ b/tests/xfs/073 @@ -131,7 +131,7 @@ _verify_copy $imgs.image $SCRATCH_DEV $SCRATCH_MNT echo echo === copying scratch device to single target, large ro device ${MKFS_XFS_PROG} -dfile,name=$imgs.source,size=100g \ - | _filter_mkfs 2>/dev/null + | _xfs_filter_mkfs 2>/dev/null rmdir $imgs.source_dir 2>/dev/null mkdir $imgs.source_dir diff --git a/tests/xfs/076 b/tests/xfs/076 index eac7410e..3cdde79e 100755 --- a/tests/xfs/076 +++ b/tests/xfs/076 @@ -61,7 +61,7 @@ _require_xfs_io_command "fpunch" _require_xfs_sparse_inodes _scratch_mkfs "-d size=50m -m crc=1 -i sparse" | - _filter_mkfs > /dev/null 2> $tmp.mkfs + _xfs_filter_mkfs > /dev/null 2> $tmp.mkfs . $tmp.mkfs # for isize _scratch_mount diff --git a/tests/xfs/078 b/tests/xfs/078 index 1f475c96..a3b75fa6 100755 --- a/tests/xfs/078 +++ b/tests/xfs/078 @@ -74,7 +74,7 @@ _grow_loop() mkfs_crc_opts="-m crc=0" fi $MKFS_XFS_PROG $mkfs_crc_opts -b size=$bsize $dparam $LOOP_DEV \ - | _filter_mkfs 2>/dev/null + | _xfs_filter_mkfs 2>/dev/null echo "*** extend loop file" _destroy_loop_device $LOOP_DEV diff --git a/tests/xfs/092 b/tests/xfs/092 index 015149e2..7e7b31fc 100755 --- a/tests/xfs/092 +++ b/tests/xfs/092 @@ -20,7 +20,7 @@ _require_scratch _require_no_large_scratch_dev MOUNT_OPTIONS="$MOUNT_OPTIONS -o inode64" -_scratch_mkfs_xfs | _filter_mkfs 2>/dev/null +_scratch_mkfs_xfs | _xfs_filter_mkfs 2>/dev/null echo Silence is golden _try_scratch_mount diff --git a/tests/xfs/104 b/tests/xfs/104 index d16f46d8..c21bd4e0 100755 --- a/tests/xfs/104 +++ b/tests/xfs/104 @@ -15,7 +15,7 @@ _begin_fstest growfs ioctl prealloc auto stress _create_scratch() { echo "*** mkfs" - _scratch_mkfs_xfs $@ | tee -a $seqres.full | _filter_mkfs 2>$tmp.mkfs + _scratch_mkfs_xfs $@ | tee -a $seqres.full | _xfs_filter_mkfs 2>$tmp.mkfs . $tmp.mkfs echo "*** mount" @@ -50,7 +50,7 @@ _supported_fs xfs _require_scratch _require_xfs_io_command "falloc" -_scratch_mkfs_xfs | tee -a $seqres.full | _filter_mkfs 2>$tmp.mkfs +_scratch_mkfs_xfs | tee -a $seqres.full | _xfs_filter_mkfs 2>$tmp.mkfs . $tmp.mkfs # extract blocksize and data size for scratch device endsize=`expr 550 \* 1048576` # stop after growing this big @@ -89,7 +89,7 @@ while [ $size -le $endsize ]; do echo "*** growing filesystem" echo "*** growing to a ${sizeb} block filesystem" >> $seqres.full xfs_growfs -D ${sizeb} $SCRATCH_MNT \ - | tee -a $seqres.full | _filter_mkfs 2>$tmp.growfs + | tee -a $seqres.full | _xfs_filter_mkfs 2>$tmp.growfs . $tmp.growfs [ `expr $size % $modsize` -eq 0 ] && wait # every 4th iteration echo AGCOUNT=$agcount | tee -a $seqres.full diff --git a/tests/xfs/108 b/tests/xfs/108 index 46070005..985b989b 100755 --- a/tests/xfs/108 +++ b/tests/xfs/108 @@ -62,7 +62,7 @@ _require_prjquota $SCRATCH_DEV # real QA test starts here rm -f $tmp.projects $seqres.full _scratch_unmount 2>/dev/null -_scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs +_scratch_mkfs_xfs | _xfs_filter_mkfs 2>$tmp.mkfs cat $tmp.mkfs >>$seqres.full _scratch_mount diff --git a/tests/xfs/109 b/tests/xfs/109 index 6cb6917a..e29d4795 100755 --- a/tests/xfs/109 +++ b/tests/xfs/109 @@ -78,7 +78,7 @@ if [ -n "$FASTSTART" -a -f $SCRATCH_MNT/f0 ]; then fi _scratch_unmount -_scratch_mkfs_xfs -dsize=160m,agcount=4 $faststart | _filter_mkfs 2>$tmp.mkfs +_scratch_mkfs_xfs -dsize=160m,agcount=4 $faststart | _xfs_filter_mkfs 2>$tmp.mkfs cat $tmp.mkfs >>$seqres.full _scratch_mount diff --git a/tests/xfs/110 b/tests/xfs/110 index 596057ef..734d2869 100755 --- a/tests/xfs/110 +++ b/tests/xfs/110 @@ -18,7 +18,7 @@ _require_scratch # real QA test starts here _scratch_unmount 2>/dev/null -_scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs +_scratch_mkfs_xfs | _xfs_filter_mkfs 2>$tmp.mkfs STR1=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA STR2=BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB diff --git a/tests/xfs/111 b/tests/xfs/111 index ede28aee..ed5a54c5 100755 --- a/tests/xfs/111 +++ b/tests/xfs/111 @@ -22,7 +22,7 @@ _require_scratch _scratch_unmount 2>/dev/null MKFS_OPTIONS="-bsize=4096" MOUNT_OPTIONS="-o noatime" -_scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs +_scratch_mkfs_xfs | _xfs_filter_mkfs 2>$tmp.mkfs _scratch_mount echo Create some files diff --git a/tests/xfs/144 b/tests/xfs/144 index 5abec9ae..d46eb1e2 100755 --- a/tests/xfs/144 +++ b/tests/xfs/144 @@ -24,7 +24,7 @@ _require_xfs_quota _require_scratch exercise() { - _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs + _scratch_mkfs_xfs | _xfs_filter_mkfs 2>$tmp.mkfs cat $tmp.mkfs >>$seqres.full # keep the blocksize and data size for dd later diff --git a/tests/xfs/153 b/tests/xfs/153 index 37303701..d410cbed 100755 --- a/tests/xfs/153 +++ b/tests/xfs/153 @@ -70,7 +70,7 @@ _filter_and_check_blks() run_tests() { - _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs + _scratch_mkfs_xfs | _xfs_filter_mkfs 2>$tmp.mkfs cat $tmp.mkfs >>$seqres.full # keep the blocksize and data size for dd later diff --git a/tests/xfs/163 b/tests/xfs/163 index 9f6dbeb8..79f420fa 100755 --- a/tests/xfs/163 +++ b/tests/xfs/163 @@ -24,7 +24,7 @@ test_shrink() _check_scratch_fs _scratch_mount - $XFS_INFO_PROG $SCRATCH_MNT 2>&1 | _filter_mkfs 2>$tmp.growfs >/dev/null + $XFS_INFO_PROG $SCRATCH_MNT 2>&1 | _xfs_filter_mkfs 2>$tmp.growfs >/dev/null . $tmp.growfs [ $ret -eq 0 -a $1 -eq $dblocks ] } @@ -38,7 +38,7 @@ echo "Format and mount" # agcount = 1 is forbidden on purpose, and need to ensure shrinking to # 2 AGs isn't feasible yet. So agcount = 3 is the minimum number now. _scratch_mkfs -dsize="$((512 * 1024 * 1024))" -dagcount=3 2>&1 | \ - tee -a $seqres.full | _filter_mkfs 2>$tmp.mkfs >/dev/null + tee -a $seqres.full | _xfs_filter_mkfs 2>$tmp.mkfs >/dev/null . $tmp.mkfs t_dblocks=$dblocks _scratch_mount >> $seqres.full diff --git a/tests/xfs/168 b/tests/xfs/168 index ffcd0df8..6b3eee30 100755 --- a/tests/xfs/168 +++ b/tests/xfs/168 @@ -19,7 +19,7 @@ _begin_fstest auto growfs shrinkfs ioctl prealloc stress create_scratch() { _scratch_mkfs_xfs $@ | tee -a $seqres.full | \ - _filter_mkfs 2>$tmp.mkfs >/dev/null + _xfs_filter_mkfs 2>$tmp.mkfs >/dev/null . $tmp.mkfs _scratch_mount @@ -48,7 +48,7 @@ _supported_fs xfs _require_scratch_xfs_shrink _require_xfs_io_command "falloc" -_scratch_mkfs_xfs | tee -a $seqres.full | _filter_mkfs 2>$tmp.mkfs >/dev/null +_scratch_mkfs_xfs | tee -a $seqres.full | _xfs_filter_mkfs 2>$tmp.mkfs >/dev/null . $tmp.mkfs # extract blocksize and data size for scratch device endsize=`expr 125 \* 1048576` # stop after shrinking this big @@ -93,7 +93,7 @@ while [ $totalcount -gt 0 ]; do [ $decb -eq 0 ] && break # get latest dblocks - $XFS_INFO_PROG $SCRATCH_MNT 2>&1 | _filter_mkfs 2>$tmp.growfs >/dev/null + $XFS_INFO_PROG $SCRATCH_MNT 2>&1 | _xfs_filter_mkfs 2>$tmp.growfs >/dev/null . $tmp.growfs size=`expr $dblocks \* $dbsize` diff --git a/tests/xfs/176 b/tests/xfs/176 index ba4aae59..57e11fd7 100755 --- a/tests/xfs/176 +++ b/tests/xfs/176 @@ -24,7 +24,7 @@ _require_xfs_io_command "falloc" _require_xfs_io_command "fpunch" _scratch_mkfs "-d size=50m -m crc=1 -i sparse" | - _filter_mkfs > /dev/null 2> $tmp.mkfs + _xfs_filter_mkfs > /dev/null 2> $tmp.mkfs . $tmp.mkfs # for isize cat $tmp.mkfs >> $seqres.full diff --git a/tests/xfs/178 b/tests/xfs/178 index a65197cd..5392b9bb 100755 --- a/tests/xfs/178 +++ b/tests/xfs/178 @@ -45,7 +45,7 @@ _supported_fs xfs # fix filesystem, new mkfs.xfs will be fine. _require_scratch -_scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs +_scratch_mkfs_xfs | _xfs_filter_mkfs 2>$tmp.mkfs test "${PIPESTATUS[0]}" -eq 0 || _fail "mkfs failed!" # By executing the followint tmp file, will get on the mkfs options stored in diff --git a/tests/xfs/186 b/tests/xfs/186 index b54fcf26..8a2a6995 100755 --- a/tests/xfs/186 +++ b/tests/xfs/186 @@ -124,7 +124,7 @@ _require_scratch _require_attrs _require_attr_v1 -_scratch_mkfs -i attr=2,size=512 -l lazy-count=1 | _filter_mkfs \ +_scratch_mkfs -i attr=2,size=512 -l lazy-count=1 | _xfs_filter_mkfs \ >>$seqres.full 2>$tmp.mkfs # import crc status and attr version . $tmp.mkfs diff --git a/tests/xfs/189 b/tests/xfs/189 index e601881a..437243c7 100755 --- a/tests/xfs/189 +++ b/tests/xfs/189 @@ -231,7 +231,7 @@ _require_noattr2 unset SCRATCH_RTDEV unset SCRATCH_LOGDEV -_scratch_mkfs_xfs | _filter_mkfs 2>/dev/null +_scratch_mkfs_xfs | _xfs_filter_mkfs 2>/dev/null _add_scratch_fstab _test_remount_rw diff --git a/tests/xfs/250 b/tests/xfs/250 index 8af32711..573340bb 100755 --- a/tests/xfs/250 +++ b/tests/xfs/250 @@ -54,7 +54,7 @@ _test_loop() echo "*** mkfs loop file (size=$size)" $MKFS_XFS_PROG -d $dparam \ - | _filter_mkfs 2>/dev/null + | _xfs_filter_mkfs 2>/dev/null echo "*** mount loop filesystem" mount -t xfs -o loop $LOOP_DEV $LOOP_MNT diff --git a/tests/xfs/259 b/tests/xfs/259 index 88e2f3ee..7c062c7d 100755 --- a/tests/xfs/259 +++ b/tests/xfs/259 @@ -49,7 +49,7 @@ for del in $sizes_to_check; do >/dev/null 2>&1 || echo "dd failed" lofile=$(losetup -f) losetup $lofile "$testfile" - $MKFS_XFS_PROG -l size=32m -b size=$bs $lofile | _filter_mkfs \ + $MKFS_XFS_PROG -l size=32m -b size=$bs $lofile | _xfs_filter_mkfs \ >/dev/null 2> $tmp.mkfs || echo "mkfs failed!" . $tmp.mkfs sync diff --git a/tests/xfs/276 b/tests/xfs/276 index 8cc48675..6774b819 100755 --- a/tests/xfs/276 +++ b/tests/xfs/276 @@ -29,7 +29,7 @@ _require_test_program "punch-alternating" rm -f "$seqres.full" echo "Format and mount" -_scratch_mkfs | _filter_mkfs 2> "$tmp.mkfs" >/dev/null +_scratch_mkfs | _xfs_filter_mkfs 2> "$tmp.mkfs" >/dev/null . $tmp.mkfs cat "$tmp.mkfs" > $seqres.full _scratch_mount diff --git a/tests/xfs/279 b/tests/xfs/279 index 835d187f..64563237 100755 --- a/tests/xfs/279 +++ b/tests/xfs/279 @@ -44,7 +44,7 @@ _check_mkfs() return fi echo "Passed." - cat $tmp.mkfs.full | _filter_mkfs >> $seqres.full 2>$tmp.mkfs + cat $tmp.mkfs.full | _xfs_filter_mkfs >> $seqres.full 2>$tmp.mkfs . $tmp.mkfs echo "Got sector size: $sectsz" device=`echo $@ | awk '{print $NF}'` diff --git a/tests/xfs/288 b/tests/xfs/288 index e3d230e9..ec12d0d1 100755 --- a/tests/xfs/288 +++ b/tests/xfs/288 @@ -20,7 +20,7 @@ _require_scratch _require_attrs # get block size ($dbsize) from the mkfs output -_scratch_mkfs_xfs 2>/dev/null | _filter_mkfs 2>$tmp.mkfs >/dev/null +_scratch_mkfs_xfs 2>/dev/null | _xfs_filter_mkfs 2>$tmp.mkfs >/dev/null . $tmp.mkfs _scratch_mount diff --git a/tests/xfs/292 b/tests/xfs/292 index cf501571..930504ca 100755 --- a/tests/xfs/292 +++ b/tests/xfs/292 @@ -25,12 +25,12 @@ rm -f $fsfile $XFS_IO_PROG -f -c "truncate 256g" $fsfile echo "mkfs.xfs without geometry" -mkfs.xfs -f $fsfile | _filter_mkfs 2> $tmp.mkfs > /dev/null +mkfs.xfs -f $fsfile | _xfs_filter_mkfs 2> $tmp.mkfs > /dev/null grep -E 'ddev|agcount|agsize' $tmp.mkfs | \ sed -e "s:$fsfile:FILENAME:g" echo "mkfs.xfs with cmdline geometry" -mkfs.xfs -f -d su=16k,sw=5 $fsfile | _filter_mkfs 2> $tmp.mkfs > /dev/null +mkfs.xfs -f -d su=16k,sw=5 $fsfile | _xfs_filter_mkfs 2> $tmp.mkfs > /dev/null grep -E 'ddev|agcount|agsize' $tmp.mkfs | \ sed -e "s:$fsfile:FILENAME:g" diff --git a/tests/xfs/299 b/tests/xfs/299 index a3077b0c..e6da413a 100755 --- a/tests/xfs/299 +++ b/tests/xfs/299 @@ -147,7 +147,7 @@ _exercise() } -_scratch_mkfs_xfs -m crc=1 2>/dev/null | _filter_mkfs 2>$tmp.mkfs +_scratch_mkfs_xfs -m crc=1 2>/dev/null | _xfs_filter_mkfs 2>$tmp.mkfs cat $tmp.mkfs >>$seqres.full # keep the blocksize and data size for dd later . $tmp.mkfs @@ -184,7 +184,7 @@ _exercise u echo "*** unmount" _scratch_unmount -_scratch_mkfs_xfs -m crc=1 2>/dev/null | _filter_mkfs 2>$tmp.mkfs +_scratch_mkfs_xfs -m crc=1 2>/dev/null | _xfs_filter_mkfs 2>$tmp.mkfs cat $tmp.mkfs >>$seqres.full # keep the blocksize and data size for dd later . $tmp.mkfs diff --git a/tests/xfs/335 b/tests/xfs/335 index ccc508e7..c2bb1bde 100755 --- a/tests/xfs/335 +++ b/tests/xfs/335 @@ -22,7 +22,7 @@ _require_xfs_io_command "falloc" rm -f "$seqres.full" echo "Format and mount" -_scratch_mkfs | _filter_mkfs 2>$tmp.mkfs >/dev/null +_scratch_mkfs | _xfs_filter_mkfs 2>$tmp.mkfs >/dev/null . $tmp.mkfs cat $tmp.mkfs > "$seqres.full" 2>&1 _scratch_mount diff --git a/tests/xfs/336 b/tests/xfs/336 index 279830b5..19ed8cc6 100755 --- a/tests/xfs/336 +++ b/tests/xfs/336 @@ -29,7 +29,7 @@ _require_xfs_io_command "falloc" rm -f "$seqres.full" echo "Format and mount" -_scratch_mkfs | _filter_mkfs 2>$tmp.mkfs >/dev/null +_scratch_mkfs | _xfs_filter_mkfs 2>$tmp.mkfs >/dev/null . $tmp.mkfs cat $tmp.mkfs > "$seqres.full" 2>&1 _scratch_mount diff --git a/tests/xfs/337 b/tests/xfs/337 index a2515e36..ca476e28 100755 --- a/tests/xfs/337 +++ b/tests/xfs/337 @@ -23,7 +23,7 @@ _disable_dmesg_check rm -f "$seqres.full" echo "+ create scratch fs" -_scratch_mkfs | _filter_mkfs 2>$tmp.mkfs >/dev/null +_scratch_mkfs | _xfs_filter_mkfs 2>$tmp.mkfs >/dev/null . $tmp.mkfs cat $tmp.mkfs > "$seqres.full" 2>&1 diff --git a/tests/xfs/341 b/tests/xfs/341 index f026aa37..dad1e0af 100755 --- a/tests/xfs/341 +++ b/tests/xfs/341 @@ -23,7 +23,7 @@ _require_xfs_io_command "falloc" rm -f "$seqres.full" echo "Format and mount" -_scratch_mkfs | _filter_mkfs 2>$tmp.mkfs >/dev/null +_scratch_mkfs | _xfs_filter_mkfs 2>$tmp.mkfs >/dev/null . $tmp.mkfs cat $tmp.mkfs > "$seqres.full" 2>&1 _scratch_mount diff --git a/tests/xfs/342 b/tests/xfs/342 index 1ae414eb..0922b3fe 100755 --- a/tests/xfs/342 +++ b/tests/xfs/342 @@ -22,7 +22,7 @@ _require_xfs_io_command "falloc" rm -f "$seqres.full" echo "Format and mount" -_scratch_mkfs | _filter_mkfs 2>$tmp.mkfs >/dev/null +_scratch_mkfs | _xfs_filter_mkfs 2>$tmp.mkfs >/dev/null . $tmp.mkfs cat $tmp.mkfs > "$seqres.full" 2>&1 _scratch_mount diff --git a/tests/xfs/443 b/tests/xfs/443 index f2390bf3..a236c8f8 100755 --- a/tests/xfs/443 +++ b/tests/xfs/443 @@ -31,7 +31,7 @@ _require_xfs_io_command "falloc" _require_xfs_io_command "fpunch" _require_xfs_io_command "swapext" -_scratch_mkfs | _filter_mkfs >> $seqres.full 2> $tmp.mkfs +_scratch_mkfs | _xfs_filter_mkfs >> $seqres.full 2> $tmp.mkfs _scratch_mount # get fs block size diff --git a/tests/xfs/448 b/tests/xfs/448 index 815f56cb..3cd56d4d 100755 --- a/tests/xfs/448 +++ b/tests/xfs/448 @@ -34,7 +34,7 @@ _require_no_xfs_bug_on_assert rm -f "$seqres.full" # Format and mount -_scratch_mkfs | _filter_mkfs > $seqres.full 2> $tmp.mkfs +_scratch_mkfs | _xfs_filter_mkfs > $seqres.full 2> $tmp.mkfs test "${PIPESTATUS[0]}" -eq 0 || _fail "mkfs failed" _scratch_mount diff --git a/tests/xfs/490 b/tests/xfs/490 index 8c3b0684..08a03261 100755 --- a/tests/xfs/490 +++ b/tests/xfs/490 @@ -37,7 +37,7 @@ filter_dmesg() # If enable free inode B+tree, this case will fail on xfs_dialloc_ag_update_inobt, # that's not what we want to test. Due to finobt feature is not necessary for this # test, so disable it directly. -_scratch_mkfs_xfs -m finobt=0 | _filter_mkfs 2>$tmp.mkfs >> $seqres.full +_scratch_mkfs_xfs -m finobt=0 | _xfs_filter_mkfs 2>$tmp.mkfs >> $seqres.full # On V5 filesystem, this case can't trigger bug because it doesn't read inodes # we are allocating from disk - it simply overwrites them with new inode diff --git a/tests/xfs/502 b/tests/xfs/502 index fb9a82c1..464326cc 100755 --- a/tests/xfs/502 +++ b/tests/xfs/502 @@ -25,7 +25,7 @@ _require_xfs_io_error_injection "iunlink_fallback" _require_scratch _require_test_program "t_open_tmpfiles" -_scratch_mkfs | _filter_mkfs 2> $tmp.mkfs > /dev/null +_scratch_mkfs | _xfs_filter_mkfs 2> $tmp.mkfs > /dev/null cat $tmp.mkfs >> $seqres.full . $tmp.mkfs diff --git a/tests/xfs/513 b/tests/xfs/513 index bfdfd4f6..a13f0a03 100755 --- a/tests/xfs/513 +++ b/tests/xfs/513 @@ -68,7 +68,7 @@ MKFS_OPTIONS="" do_mkfs() { echo "FORMAT: $@" | filter_loop | tee -a $seqres.full - $MKFS_XFS_PROG -f $* $LOOP_DEV | _filter_mkfs >>$seqres.full 2>$tmp.mkfs + $MKFS_XFS_PROG -f $* $LOOP_DEV | _xfs_filter_mkfs >>$seqres.full 2>$tmp.mkfs if [ "${PIPESTATUS[0]}" -ne 0 ]; then _fail "Fails on _mkfs_dev $* $LOOP_DEV" fi diff --git a/tests/xfs/530 b/tests/xfs/530 index 9c6f44d7..925a7b49 100755 --- a/tests/xfs/530 +++ b/tests/xfs/530 @@ -38,7 +38,7 @@ _require_scratch_nocheck echo "* Test extending rt inodes" -_scratch_mkfs | _filter_mkfs >> $seqres.full 2> $tmp.mkfs +_scratch_mkfs | _xfs_filter_mkfs >> $seqres.full 2> $tmp.mkfs . $tmp.mkfs echo "Create fake rt volume" diff --git a/tests/xfs/533 b/tests/xfs/533 index b85b5298..c7d470c9 100755 --- a/tests/xfs/533 +++ b/tests/xfs/533 @@ -23,7 +23,7 @@ _require_test_program "punch-alternating" _require_xfs_io_error_injection "reduce_max_iextents" _require_xfs_io_error_injection "bmap_alloc_minlen_extent" -_scratch_mkfs_sized $((1024 * 1024 * 1024)) | _filter_mkfs >> $seqres.full 2> $tmp.mkfs +_scratch_mkfs_sized $((1024 * 1024 * 1024)) | _xfs_filter_mkfs >> $seqres.full 2> $tmp.mkfs . $tmp.mkfs # Filesystems with directory block size greater than one FSB will not be tested, From patchwork Mon Feb 7 06:55:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shin'ichiro Kawasaki X-Patchwork-Id: 12736984 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 0794AC433FE for ; Mon, 7 Feb 2022 07:16:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233465AbiBGHPo (ORCPT ); Mon, 7 Feb 2022 02:15:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238603AbiBGG4z (ORCPT ); Mon, 7 Feb 2022 01:56:55 -0500 Received: from esa5.hgst.iphmx.com (esa5.hgst.iphmx.com [216.71.153.144]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22B6EC043181; Sun, 6 Feb 2022 22:56:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1644217014; x=1675753014; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PmOAO/z/5SQRJrAaX0rjm1/SDaYQLCQkeqzLnW4Z6gk=; b=Zc9Bb2JQ2mD/1RrbfaXULEHaRFxbDpUhxdp5avSkNmioTTM2CTB3pDXB vR9AdvpeJDelWCMohY+ty7mMV9tTESKeGRDLo0I2PlO9a1mcIeNpMVsZh k6UE1hN3SDsL0ZnfneUy7UwUTxHs2VXNOJp9buyPqEN7njmeI6Y+s1R2u F2Ln5ZsCJE/ZimfozdufRnVt2O00mPGDi4YMh+PLIDwbH0Q2MNzBwPqVv PJaDYg/b9LdRyfrC29H4+9pbVo8/Geq+R+7OAoSZWuTUHTEyB3g4fSsh4 K2y7a+VUQCn6K54eexMyDMK0pUVSHFRwB2A8fusJYH8qfCPY+MAX4U69q A==; X-IronPort-AV: E=Sophos;i="5.88,349,1635177600"; d="scan'208";a="192305063" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 07 Feb 2022 14:55:50 +0800 IronPort-SDR: r9932kn+f4XOEzku5Flek6+HFtzQc+8HL+uc3Mwj4k3AoR7t3uIqYKz75WhmKTLnp/0lFImHkI IDlWcy0JWXKhbs92gMFpgNLAatAc9qebkeqV80212Q9AVDc0f63bgyW/doz0owoRTKDS13slfl ED/nKvydEV3tk/1+hIZkF6kipoNp+NmkM2bJlYocMamIbGZrxaZucjg8sr6DIi7cY6X4apYYEs DsWojXKKPT26Ui6yDalliQ4vsZfGADH7S+PguUk+OcMfSOfiHN9aN25q0ipBpJBCI6vtCPl2Zy iUSu+9j5/x0pkoAFT5Jh8n9R Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2022 22:28:52 -0800 IronPort-SDR: r8QQtUb9+zVVEQp3oSLE4cpDzRuok5hPjxlAL9Eb1Pz5tM2Z7zejavee8SQH57O5ZBbdhjKPhf Zh8qpfV5RPdCEg51HImkRuSlzoJig7m/auj+plV/nzomwAMpW1kF8UQ0GdtBvygfWXKOVcroD+ 6GLDqJqZWNVtMAgEZBNy4JPC0nNPY1TNwoXZ8NWzEeGWisO52ZwOM14vJ8FbgsP1VRVLU0Ir65 OObTMBuRjWbNwYKLKvb+yH/D7KMgjsreFcNOdzEN9zj+wO4ZWWU4gPOqTWjNPUhmjLCNOoAEP9 ei0= WDCIronportException: Internal Received: from shindev.dhcp.fujisawa.hgst.com (HELO shindev.fujisawa.hgst.com) ([10.149.52.173]) by uls-op-cesaip01.wdc.com with ESMTP; 06 Feb 2022 22:55:50 -0800 From: Shin'ichiro Kawasaki To: fstests@vger.kernel.org, linux-btrfs@vger.kernel.org Cc: linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org, Naohiro Aota , Johannes Thumshirn , Damien Le Moal , Shin'ichiro Kawasaki Subject: [PATCH 6/7] common: move _xfs_filter_mkfs from common/filter to common/xfs Date: Mon, 7 Feb 2022 15:55:40 +0900 Message-Id: <20220207065541.232685-7-shinichiro.kawasaki@wdc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220207065541.232685-1-shinichiro.kawasaki@wdc.com> References: <20220207065541.232685-1-shinichiro.kawasaki@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org The helper function _xfs_filter_mkfs works only for xfs. Move it from common/filter to common/xfs. Also remove useless lines for other filesystems. Suggested-by: Naohiro Aota Signed-off-by: Shin'ichiro Kawasaki --- common/filter | 53 --------------------------------------------------- common/xfs | 43 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 53 deletions(-) diff --git a/common/filter b/common/filter index 24fd0650..7c71be4f 100644 --- a/common/filter +++ b/common/filter @@ -115,59 +115,6 @@ _filter_date() -e 's/[A-Z][a-z][a-z] [A-z][a-z][a-z] *[0-9][0-9]* [0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9][0-9][0-9][0-9]$/DATE/' } -# prints filtered output on stdout, values (use eval) on stderr -# Non XFS filesystems always return a 4k block size and a 256 byte inode. -_xfs_filter_mkfs() -{ - case $FSTYP in - xfs) - ;; - *) - cat - >/dev/null - perl -e 'print STDERR "dbsize=4096\nisize=256\n"' - return ;; - esac - - echo "_fs_has_crcs=0" >&2 - set - - perl -ne ' - if (/^meta-data=([\w,|\/.-]+)\s+isize=(\d+)\s+agcount=(\d+), agsize=(\d+) blks/) { - print STDERR "ddev=$1\nisize=$2\nagcount=$3\nagsize=$4\n"; - print STDOUT "meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks\n"; - } - if (/^\s+=\s+sectsz=(\d+)\s+attr=(\d+)/) { - print STDERR "sectsz=$1\nattr=$2\n"; - } - if (/^\s+=\s+crc=(\d)/) { - print STDERR "_fs_has_crcs=$1\n"; - } - if (/^data\s+=\s+bsize=(\d+)\s+blocks=(\d+), imaxpct=(\d+)/) { - print STDERR "dbsize=$1\ndblocks=$2\nimaxpct=$3\n"; - print STDOUT "data = bsize=XXX blocks=XXX, imaxpct=PCT\n"; - } - if (/^\s+=\s+sunit=(\d+)\s+swidth=(\d+) blks/) { - print STDERR "sunit=$1\nswidth=$2\nunwritten=1\n"; - print STDOUT " = sunit=XXX swidth=XXX, unwritten=X\n"; - } - if (/^naming\s+=version\s+(\d+)\s+bsize=(\d+)/) { - print STDERR "dirversion=$1\ndirbsize=$2\n"; - print STDOUT "naming =VERN bsize=XXX\n"; - } - if (/^log\s+=(internal log|[\w|\/.-]+)\s+bsize=(\d+)\s+blocks=(\d+),\s+version=(\d+)/ || - /^log\s+=(internal log|[\w|\/.-]+)\s+bsize=(\d+)\s+blocks=(\d+)/) { - print STDERR "ldev=\"$1\"\nlbsize=$2\nlblocks=$3\nlversion=$4\n"; - print STDOUT "log =LDEV bsize=XXX blocks=XXX\n"; - } - if (/^\s+=\s+sectsz=(\d+)\s+sunit=(\d+) blks/) { - print STDERR "logsectsz=$1\nlogsunit=$2\n\n"; - } - if (/^realtime\s+=([\w|\/.-]+)\s+extsz=(\d+)\s+blocks=(\d+), rtextents=(\d+)/) { - print STDERR "rtdev=$1\nrtextsz=$2\nrtblocks=$3\nrtextents=$4\n"; - print STDOUT "realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX\n"; - }' -} - - # prints the bits we care about in growfs # _filter_growfs() diff --git a/common/xfs b/common/xfs index 3435c706..a3da25dd 100644 --- a/common/xfs +++ b/common/xfs @@ -1275,3 +1275,46 @@ _require_scratch_xfs_bigtime() _notrun "bigtime feature not advertised on mount?" _scratch_unmount } + +# prints filtered output on stdout, values (use eval) on stderr +# Non XFS filesystems always return a 4k block size and a 256 byte inode. +_xfs_filter_mkfs() +{ + echo "_fs_has_crcs=0" >&2 + set - + perl -ne ' + if (/^meta-data=([\w,|\/.-]+)\s+isize=(\d+)\s+agcount=(\d+), agsize=(\d+) blks/) { + print STDERR "ddev=$1\nisize=$2\nagcount=$3\nagsize=$4\n"; + print STDOUT "meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks\n"; + } + if (/^\s+=\s+sectsz=(\d+)\s+attr=(\d+)/) { + print STDERR "sectsz=$1\nattr=$2\n"; + } + if (/^\s+=\s+crc=(\d)/) { + print STDERR "_fs_has_crcs=$1\n"; + } + if (/^data\s+=\s+bsize=(\d+)\s+blocks=(\d+), imaxpct=(\d+)/) { + print STDERR "dbsize=$1\ndblocks=$2\nimaxpct=$3\n"; + print STDOUT "data = bsize=XXX blocks=XXX, imaxpct=PCT\n"; + } + if (/^\s+=\s+sunit=(\d+)\s+swidth=(\d+) blks/) { + print STDERR "sunit=$1\nswidth=$2\nunwritten=1\n"; + print STDOUT " = sunit=XXX swidth=XXX, unwritten=X\n"; + } + if (/^naming\s+=version\s+(\d+)\s+bsize=(\d+)/) { + print STDERR "dirversion=$1\ndirbsize=$2\n"; + print STDOUT "naming =VERN bsize=XXX\n"; + } + if (/^log\s+=(internal log|[\w|\/.-]+)\s+bsize=(\d+)\s+blocks=(\d+),\s+version=(\d+)/ || + /^log\s+=(internal log|[\w|\/.-]+)\s+bsize=(\d+)\s+blocks=(\d+)/) { + print STDERR "ldev=\"$1\"\nlbsize=$2\nlblocks=$3\nlversion=$4\n"; + print STDOUT "log =LDEV bsize=XXX blocks=XXX\n"; + } + if (/^\s+=\s+sectsz=(\d+)\s+sunit=(\d+) blks/) { + print STDERR "logsectsz=$1\nlogsunit=$2\n\n"; + } + if (/^realtime\s+=([\w|\/.-]+)\s+extsz=(\d+)\s+blocks=(\d+), rtextents=(\d+)/) { + print STDERR "rtdev=$1\nrtextsz=$2\nrtblocks=$3\nrtextents=$4\n"; + print STDOUT "realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX\n"; + }' +} From patchwork Mon Feb 7 06:55:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shin'ichiro Kawasaki X-Patchwork-Id: 12736985 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 16735C433EF for ; Mon, 7 Feb 2022 07:16:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233770AbiBGHPq (ORCPT ); Mon, 7 Feb 2022 02:15:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238631AbiBGG45 (ORCPT ); Mon, 7 Feb 2022 01:56:57 -0500 Received: from esa5.hgst.iphmx.com (esa5.hgst.iphmx.com [216.71.153.144]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DBA0C043184; Sun, 6 Feb 2022 22:56:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1644217015; x=1675753015; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=78Zs28KpKxQ8bPUPZ5jK1PRmnWo6oej03te2uWqoGL8=; b=LvJJWJD1fiCvDKTxHbtlVXSoTOLhD9SQgFNpO7+NMRUwRjxVq4DidYtX jKBOsI8plwoNyNrg4MLxPr8IZgzI+8ow4UKlGsBD26vciiqpp48oO4WL6 kClafmIZAlEK++btL8P94XHEW9g6dAtIjbBUshLd3bQPtwhLywMPSyfPf M4cwZ8HUcWOafGStVFr78oJv28dH8fEroHCbgcdP4lKr9x5qehII/o9ov m82XHTNnEhjGzAdT6RCw5kQAARW36SyGB9LhAfp1N3E2lUQXfacnBaUIE zK2kLmGSMVOq5JqtfhC3vnWbNrbcFlTEJZMNDz6+VYNMLrhy6+ZjHkJn2 Q==; X-IronPort-AV: E=Sophos;i="5.88,349,1635177600"; d="scan'208";a="192305071" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 07 Feb 2022 14:55:51 +0800 IronPort-SDR: EMJgNkMWnFfkl8IJ5MjTea6OkFCwZjeZTatf/gXYHTpkC9JCNzxI4Ha6HvoqCtZ4xswEKbqj23 gOkPz2nrGws7WoeU84Ba5ndNmcRQqxez8XGl38Q3wMbaCcbhvK7U7kgUPGXvfVQT3OU8zVGkvO Re8BSBoABIx7Em0DZKffm+AlAYPibJS4mEvXLkfGHeCGsc4ImWz9nihNxL3NPVNsyw/2tsavNG X1dy/r/qsBmay03a6U62wNrOpVl7Z/gc+Xc7fKnPgPoPMlSGxEkFC9my4To9AtZp0xqY5yTJr1 GiBn0nosIprTflDJEDTmFNId Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2022 22:28:53 -0800 IronPort-SDR: GMWIEtGmlMxmFLTe4Rb5AN6uU0cHMtnWRJhC+waZTS9hy7Au4NwNulNQZKvFrvlN26Xo4IMdDy MfstK1BTqaJG3JE0Eu8p5GKbtah5dU+1qYVVwMLFrITB+N+ppNtF/diabefS9ifyGhcv8wKFy2 kWd7KpVTJFwYJX4ZSmHIPN4nQF/VAeh6VvJtM1lCoMgCOGfqp77sq1Npd81CHy5mbf7ZL2pQEo HPOHRLUN1bRh9lA+pJ/jQdFRBUYrK4NUM8jW33EdxY6zfw3+rgV2ZNqY6mMX6sKyH4EDURkSQ6 gyA= WDCIronportException: Internal Received: from shindev.dhcp.fujisawa.hgst.com (HELO shindev.fujisawa.hgst.com) ([10.149.52.173]) by uls-op-cesaip01.wdc.com with ESMTP; 06 Feb 2022 22:55:52 -0800 From: Shin'ichiro Kawasaki To: fstests@vger.kernel.org, linux-btrfs@vger.kernel.org Cc: linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org, Naohiro Aota , Johannes Thumshirn , Damien Le Moal , Shin'ichiro Kawasaki Subject: [PATCH 7/7] generic/204: do xfs unique preparation only for xfs Date: Mon, 7 Feb 2022 15:55:41 +0900 Message-Id: <20220207065541.232685-8-shinichiro.kawasaki@wdc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220207065541.232685-1-shinichiro.kawasaki@wdc.com> References: <20220207065541.232685-1-shinichiro.kawasaki@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org The test case generic/204 formats the scratch device to get block size as a part of preparation. However, this preparation is required only for xfs. To simplify preparation for other filesystems, do the preparation only for xfs. Suggested-by: Naohiro Aota Signed-off-by: Shin'ichiro Kawasaki --- tests/generic/204 | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/tests/generic/204 b/tests/generic/204 index 40d524d1..ea267760 100755 --- a/tests/generic/204 +++ b/tests/generic/204 @@ -16,17 +16,18 @@ _cleanup() sync } -# Import common functions. -. ./common/filter - # real QA test starts here _supported_fs generic _require_scratch -# get the block size first -_scratch_mkfs 2> /dev/null | _xfs_filter_mkfs 2> $tmp.mkfs > /dev/null -. $tmp.mkfs +dbsize=4096 +isize=256 +if [ $FSTYP = "xfs" ]; then + # get the block size first + _scratch_mkfs 2> /dev/null | _xfs_filter_mkfs 2> $tmp.mkfs > /dev/null + . $tmp.mkfs +fi # For xfs, we need to handle the different default log sizes that different # versions of mkfs create. All should be valid with a 16MB log, so use that. @@ -37,11 +38,15 @@ _scratch_mkfs 2> /dev/null | _xfs_filter_mkfs 2> $tmp.mkfs > /dev/null SIZE=`expr 115 \* 1024 \* 1024` _scratch_mkfs_sized $SIZE $dbsize 2> /dev/null > $tmp.mkfs.raw \ || _fail "mkfs failed" -cat $tmp.mkfs.raw | _xfs_filter_mkfs 2> $tmp.mkfs > /dev/null + +if [ $FSTYP = "xfs" ]; then + cat $tmp.mkfs.raw | _xfs_filter_mkfs 2> $tmp.mkfs > /dev/null + # Source $tmp.mkfs to get geometry + . $tmp.mkfs +fi + _scratch_mount -# Source $tmp.mkfs to get geometry -. $tmp.mkfs # fix the reserve block pool to a known size so that the enospc calculations # work out correctly. Space usages is based 22500 files and 1024 reserved blocks