From patchwork Wed Apr 11 16:08:09 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: 10335745 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 D325160365 for ; Wed, 11 Apr 2018 16:08:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C2585289BE for ; Wed, 11 Apr 2018 16:08:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B6E97289BF; Wed, 11 Apr 2018 16:08:16 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, 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 D524E289C6 for ; Wed, 11 Apr 2018 16:08:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753320AbeDKQIO (ORCPT ); Wed, 11 Apr 2018 12:08:14 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:50986 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753040AbeDKQIN (ORCPT ); Wed, 11 Apr 2018 12:08:13 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w3BG6Uke012523; Wed, 11 Apr 2018 16:08:12 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : mime-version : content-type; s=corp-2017-10-26; bh=iXCUtzi9dz31MzYEXiQpX+ssG9zU002/a1ePfeMlV5E=; b=H5kupmxTvA0v/zHJlQJdbyT12tR42D0XXLGXDQ6VI641k3zneje4k7d26l/qGOWd8jgr 5MOeLNjWPTq01BlmF4eIYBFDP1MeSfi9zkZqUET6nSkVRs4Q7SbPF/E1TiGENY/sUNcS vUtBuKr8ZimGp4KvKxglj5CSEo05LDfpx9+NWtUdvl8nrtndHpbv3xbYppUo2jARB+Rd 6vQDlkdAjiC8bDShQ0WggiyAyVABCPZ3dq0/jupO7UwDu1x6Ah0KntPYn8DAkcR08lLW jY9JuBxKO6Jrg82Nl49xnb82HCObcc298mdXkDOnuPCGQ/Yf4kRAPM1kyAunby7AK99L eA== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2120.oracle.com with ESMTP id 2h6pn4quy2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 11 Apr 2018 16:08:12 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w3BG8BUm024198 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 11 Apr 2018 16:08:11 GMT Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w3BG8AuY028107; Wed, 11 Apr 2018 16:08:10 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 11 Apr 2018 09:08:10 -0700 Date: Wed, 11 Apr 2018 09:08:09 -0700 From: "Darrick J. Wong" To: Eryu Guan Cc: fstests Subject: [PATCH] xfs/187: fix ftype brokenness Message-ID: <20180411160809.GA13697@magnolia> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8860 signatures=668698 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=683 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1804110150 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 This test requires XFS_SB_VERSION_MOREBITSBIT to be zero. ftype (which is now enabled by default) causes this to be set, so detect it in mkfs and disable it. Signed-off-by: Darrick J. Wong --- tests/xfs/187 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe fstests" 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/187 b/tests/xfs/187 index 07ef3ae..e1a8ce9 100755 --- a/tests/xfs/187 +++ b/tests/xfs/187 @@ -70,8 +70,14 @@ export MOUNT_OPTIONS="" # lazysb, attr2 and other feature bits are held in features2 and will require # morebitsbit on So test with lazysb and without it to see if the morebitsbit is # okay etc. If the mkfs defaults change, these need to change as well. -export MKFS_NO_LAZY="-m crc=0 -l lazy-count=0 -i projid32bit=0" -export MKFS_LAZY="-m crc=0 -l lazy-count=1 -i projid32bit=0" +MKFS_NO_LAZY="-m crc=0 -l lazy-count=0 -i projid32bit=0" +MKFS_LAZY="-m crc=0 -l lazy-count=1 -i projid32bit=0" + +# Detect ftype +if _scratch_mkfs --help 2>&1 | grep -q "ftype="; then + MKFS_NO_LAZY="$MKFS_NO_LAZY -n ftype=0" + MKFS_LAZY="$MKFS_LAZY -n ftype=0" +fi # Make sure that when we think we are testing with morebits off # that we really are.