From patchwork Mon Sep 24 10:16:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 10612179 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 B6A6C913 for ; Mon, 24 Sep 2018 10:16:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6C3229EEC for ; Mon, 24 Sep 2018 10:16:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A73429EFE; Mon, 24 Sep 2018 10:16: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=-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 4B4B429EEC for ; Mon, 24 Sep 2018 10:16:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728577AbeIXQSH (ORCPT ); Mon, 24 Sep 2018 12:18:07 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:36328 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728229AbeIXQSF (ORCPT ); Mon, 24 Sep 2018 12:18:05 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w8OAEsik107805; Mon, 24 Sep 2018 10:16:44 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=b4/O6hr7kdAPr6yQPllYGkZ2rCnWSzNRnrYY+TU22jw=; b=sxwASZAVcRSnZ5zW4T6yuoajnJNnS52t8OTPWBIn3jk6x8DkOAEUlEE2fD1i/YkUuXVN d/fKm8kCqelaz9gq8pcii6IkmMOdV0AMp1gtCPztC73fbCN4IB+8khbYqO9oQ/H7OW1P nmzPUNB4yL9FWZtufqKmEslA6FI0r6mfM5N8k9odd/tn8ppwKlPgylT2p26fu9NCLNDt nfaP07QRJIUyfbKeCnx8pQIhzJm9LrHrcYYKg1+UW1jf+cPeWRhKfydtdf7cT63k+2JS ncMlVSzMXIZCOSwnX0xIJmRDTV1Vg2Tv5myCzIUYXUqIN6ML36OddUf4BdhB644XlDk5 jw== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp2120.oracle.com with ESMTP id 2mndpp4rgw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 24 Sep 2018 10:16:44 +0000 Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w8OAGgBE020736 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 24 Sep 2018 10:16:43 GMT Received: from abhmp0001.oracle.com (abhmp0001.oracle.com [141.146.116.7]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w8OAGgiw032201; Mon, 24 Sep 2018 10:16:42 GMT Received: from tpasj.sg.oracle.com (/10.186.50.4) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 24 Sep 2018 03:16:42 -0700 From: Anand Jain To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org Subject: [PATCH 1/9] fstests: btrfs: _scratch_mkfs_sized fix min size without mixed option Date: Mon, 24 Sep 2018 18:16:25 +0800 Message-Id: <1537784193-24431-2-git-send-email-anand.jain@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1537784193-24431-1-git-send-email-anand.jain@oracle.com> References: <1537784193-24431-1-git-send-email-anand.jain@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9025 signatures=668707 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=13 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=710 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1809240108 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 As of now _scratch_mkfs_sized check if the requested size is below 1G and forces the --mixed option for the mkfs.btrfs. Well the correct size at which we need to force the mixed option is 114294784bytes. Fix that. Signed-off-by: Anand Jain --- common/rc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/rc b/common/rc index d5bb1feee2c3..bcdbf03e1bf0 100644 --- a/common/rc +++ b/common/rc @@ -969,7 +969,9 @@ _scratch_mkfs_sized() ;; btrfs) local mixed_opt= - (( fssize <= 1024 * 1024 * 1024 )) && mixed_opt='--mixed' + # minimum size that's needed without the mixed option. + # Non mixed mode is also the default option. + (( fssize < 114294784 )) && mixed_opt='--mixed' $MKFS_BTRFS_PROG $MKFS_OPTIONS $mixed_opt -b $fssize $SCRATCH_DEV ;; jfs)