From patchwork Mon Oct 8 06:23:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chandan Rajendra X-Patchwork-Id: 10630083 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 6F3E9184E for ; Mon, 8 Oct 2018 06:21:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 61C71289FF for ; Mon, 8 Oct 2018 06:21:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5101928C3C; Mon, 8 Oct 2018 06:21:06 +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 E41BF289FF for ; Mon, 8 Oct 2018 06:21:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726020AbeJHNbK (ORCPT ); Mon, 8 Oct 2018 09:31:10 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:38828 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726113AbeJHNbK (ORCPT ); Mon, 8 Oct 2018 09:31:10 -0400 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w986JqP4098655 for ; Mon, 8 Oct 2018 02:21:04 -0400 Received: from e31.co.us.ibm.com (e31.co.us.ibm.com [32.97.110.149]) by mx0b-001b2d01.pphosted.com with ESMTP id 2myxynxayw-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 08 Oct 2018 02:21:03 -0400 Received: from localhost by e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 8 Oct 2018 00:21:02 -0600 Received: from b03cxnp08025.gho.boulder.ibm.com (9.17.130.17) by e31.co.us.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 8 Oct 2018 00:20:59 -0600 Received: from b03ledav003.gho.boulder.ibm.com (b03ledav003.gho.boulder.ibm.com [9.17.130.234]) by b03cxnp08025.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w986Kwt525297078 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Sun, 7 Oct 2018 23:20:58 -0700 Received: from b03ledav003.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BF7F66A04D; Mon, 8 Oct 2018 00:20:58 -0600 (MDT) Received: from b03ledav003.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 489F76A047; Mon, 8 Oct 2018 00:20:56 -0600 (MDT) Received: from localhost.localdomain.com (unknown [9.85.87.114]) by b03ledav003.gho.boulder.ibm.com (Postfix) with ESMTP; Mon, 8 Oct 2018 00:20:55 -0600 (MDT) From: Chandan Rajendra To: fstests@vger.kernel.org Cc: Chandan Rajendra , guaneryu@gmail.com, darrick.wong@oracle.com, zlang@redhat.com, david@fromorbit.com, linux-xfs@vger.kernel.org Subject: [PATCH 2/2] xfs/140: work with 1k block size Date: Mon, 8 Oct 2018 11:53:03 +0530 X-Mailer: git-send-email 2.9.5 In-Reply-To: <20181008062303.32286-1-chandan@linux.vnet.ibm.com> References: <20181008062303.32286-1-chandan@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18100806-8235-0000-0000-00000E0EEE24 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00009840; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000267; SDB=6.01099528; UDB=6.00568807; IPR=6.00879577; MB=3.00023656; MTD=3.00000008; XFM=3.00000015; UTC=2018-10-08 06:21:01 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18100806-8236-0000-0000-000042EA75BE Message-Id: <20181008062303.32286-2-chandan@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-10-08_02:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1810080065 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 7a7641063ac3a7ae051c9e1959f4d7b1a25bb91c (xfs/140: work with 64k block size) created a test filesystem with AG size set to (8192 * block size). When working with a 1k block sized XFS filesystem, this tries to set the AG size to 8MiB which is less than the minimum AG size of 16MiB. Hence creation of the filesystem had actually failed. This commit fixes the issue by resetting AG size to 16MiB if (8192 * block size) results in a value less than 16MiB. Later the test file size and the test file block count are then appropriately calculated. Reported-by: Dave Chinner Signed-off-by: Chandan Rajendra --- tests/xfs/140 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/xfs/140 b/tests/xfs/140 index c06a722..7385dc4 100755 --- a/tests/xfs/140 +++ b/tests/xfs/140 @@ -39,16 +39,21 @@ _scratch_mount blksz=$(_get_file_block_size $SCRATCH_MNT) _scratch_unmount +agsize=$((8192 * $blksz)) +if [[ $agsize -lt $((16 * 1024 * 1024)) ]]; then + agsize=$((16 * 1024 * 1024)) +fi +sz=$((4096 * $blksz + $agsize)) +nr=$(($sz / $blksz)) + echo "Format and mount" -_scratch_mkfs -d agsize=$((8192 * $blksz)) > $seqres.full 2>&1 +_scratch_mkfs -d agsize=$agsize > $seqres.full 2>&1 _scratch_mount >> $seqres.full 2>&1 testdir=$SCRATCH_MNT/test-$seq mkdir $testdir echo "Create the original files" -nr=12288 -sz=$(($nr * $blksz)) _pwrite_byte 0x61 0 $sz $testdir/file1 >> $seqres.full _cp_reflink $testdir/file1 $testdir/file2 >> $seqres.full _pwrite_byte 0x61 0 $sz $testdir/file2.chk >> $seqres.full