From patchwork Thu Jul 21 23:46:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 9242689 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 16A4D60574 for ; Thu, 21 Jul 2016 23:46:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08350223A4 for ; Thu, 21 Jul 2016 23:46:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F122B26E81; Thu, 21 Jul 2016 23:46:49 +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=-6.9 required=2.0 tests=BAYES_00, 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 A817F223A4 for ; Thu, 21 Jul 2016 23:46:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752512AbcGUXqp (ORCPT ); Thu, 21 Jul 2016 19:46:45 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:29513 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752490AbcGUXqo (ORCPT ); Thu, 21 Jul 2016 19:46:44 -0400 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u6LNkcx4007951 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Jul 2016 23:46:39 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0022.oracle.com (8.14.4/8.13.8) with ESMTP id u6LNkcmX027014 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 21 Jul 2016 23:46:38 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by userv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u6LNkcNh032321; Thu, 21 Jul 2016 23:46:38 GMT Received: from localhost (/10.145.178.207) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 21 Jul 2016 16:46:37 -0700 Subject: [PATCH 03/17] xfs/310: fix the size calculation for the huge device From: "Darrick J. Wong" To: david@fromorbit.com, eguan@redhat.com, darrick.wong@oracle.com Cc: linux-btrfs@vger.kernel.org, fstests@vger.kernel.org, xfs@oss.sgi.com Date: Thu, 21 Jul 2016 16:46:35 -0700 Message-ID: <146914479586.11762.2725828627113169692.stgit@birch.djwong.org> In-Reply-To: <146914477514.11762.3144320628851923350.stgit@birch.djwong.org> References: <146914477514.11762.3144320628851923350.stgit@birch.djwong.org> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fix the calculation of the dmhuge size. The previous calculation tried to calculate the size correctly, but got it wrong for 1k block sizes. Therefore, clean the whole mess up. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig --- tests/xfs/310 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/tests/xfs/310 b/tests/xfs/310 index bfdec39..5125773 100755 --- a/tests/xfs/310 +++ b/tests/xfs/310 @@ -63,7 +63,9 @@ blksz="$(stat -f $SCRATCH_MNT -c '%S')" umount $SCRATCH_MNT echo "Format huge device" -_dmhugedisk_init $((blksz * 2 * 4400)) # a little over 2^22 blocks +nr_blks=2100000 # 2^21 plus a little more +sectors=$(( (nr_blks * 3) * blksz / 512 )) # each AG must have > 2^21 blocks +_dmhugedisk_init $sectors _mkfs_dev -d agcount=2 $DMHUGEDISK_DEV _mount $DMHUGEDISK_DEV $SCRATCH_MNT xfs_info $SCRATCH_MNT >> $seqres.full @@ -71,7 +73,6 @@ xfs_info $SCRATCH_MNT >> $seqres.full echo "Create the original file blocks" mkdir $testdir blksz="$(stat -f $testdir -c '%S')" -nr_blks=2100000 # 2^21 plus a little more $XFS_IO_PROG -f -c "falloc 0 $((nr_blks * blksz))" $testdir/file1 >> $seqres.full echo "Check extent count"