From patchwork Thu Nov 1 23:19:46 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: 10664683 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 0414417DF for ; Thu, 1 Nov 2018 23:19:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC5A12C518 for ; Thu, 1 Nov 2018 23:19:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E0A552C539; Thu, 1 Nov 2018 23:19:54 +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=unavailable 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 88FD42C518 for ; Thu, 1 Nov 2018 23:19:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728117AbeKBIYz (ORCPT ); Fri, 2 Nov 2018 04:24:55 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:53364 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727749AbeKBIYz (ORCPT ); Fri, 2 Nov 2018 04:24:55 -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 wA1NJ9Jd134495; Thu, 1 Nov 2018 23:19:51 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=PEIfZdgr2y9KosP2YosdSg/6pJqh7kIPR+BDM7Q/B3Y=; b=VIsQ1KTksw0kPeVJqGEklA1XgrnFLOVkyGszh/4mgiO9NSrDz8gVLjsnHuiOe2dj8Bzt Zf28C1Kzf/VOqx6RBtuDlQdmq4eX54YhYdEnmMYmx4f1v3GDWhiJarmNCEjs2phNmOC5 ObT2FxaC+pBZuee8EvStWL2aW/MEj5W5opfkaLUoiDdjJFVs2G4k1rYoTwo2bfc3MACy 2mZ6dj5Y5T/CCyKShDKcIa/FoHJdxOVvLAf8tZo2aSTB4AOUWXc/ovrtSgi2Gy4AabEu vDYjPy7x6qjhwoxdpNg0V6RbTP+UNBpkSQ1EwIwh294wwrcElxJhpC4th9x2IEuRt+P0 Mw== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp2120.oracle.com with ESMTP id 2ncfyqbpsy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 01 Nov 2018 23:19:51 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id wA1NJoPr011536 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 1 Nov 2018 23:19:51 GMT Received: from abhmp0019.oracle.com (abhmp0019.oracle.com [141.146.116.25]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id wA1NJm2D030901; Thu, 1 Nov 2018 23:19:48 GMT Received: from localhost (/10.145.178.77) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 01 Nov 2018 16:19:47 -0700 Subject: [PATCH 7/8] misc: force the exact quota options coded into the test From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Thu, 01 Nov 2018 16:19:46 -0700 Message-ID: <154111438630.6577.12698243646066699280.stgit@magnolia> In-Reply-To: <154111434286.6577.15010861884505931015.stgit@magnolia> References: <154111434286.6577.15010861884505931015.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9064 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1811010194 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong Several tests require setting exactly the quota mount options that are encoded in the test. Unfortunately, quota mount options set by the user in MOUNT_OPTIONS can turn on other quota types, which causes the golden outputs to be off for various reasons (quota report output, behavior changes, etc.) So use _qmount_option to delete all the quota mount options in these tests so that the test itself can run with exactly the config for which it was written. Signed-off-by: Darrick J. Wong --- tests/generic/230 | 3 +++ tests/xfs/075 | 4 ++++ tests/xfs/116 | 3 +++ tests/xfs/132 | 5 +++++ tests/xfs/220 | 3 +++ 5 files changed, 18 insertions(+) diff --git a/tests/generic/230 b/tests/generic/230 index 66b12d2f..e0a876ba 100755 --- a/tests/generic/230 +++ b/tests/generic/230 @@ -99,6 +99,9 @@ rm -f $seqres.full grace=2 +# Test only the quota type specified in each _scratch_mount clause below. +_qmount_option 'defaults' + _scratch_mkfs >> $seqres.full 2>&1 _scratch_mount "-o usrquota,grpquota" BLOCK_SIZE=$(_get_file_block_size $SCRATCH_MNT) diff --git a/tests/xfs/075 b/tests/xfs/075 index caf612bb..dee01462 100755 --- a/tests/xfs/075 +++ b/tests/xfs/075 @@ -25,12 +25,16 @@ _cleanup() # get standard environment, filters and checks . ./common/rc . ./common/filter +. ./common/quota # real QA test starts here _supported_fs xfs _supported_os Linux _require_scratch +# norecovery mounts do not succeed with quotas eanbled, so shut them off +_qmount_option "defaults" + echo "Silence is golden" _scratch_mkfs_sized $((512 * 1024 * 1024)) >$seqres.full diff --git a/tests/xfs/116 b/tests/xfs/116 index 6887d7e5..4422eb50 100755 --- a/tests/xfs/116 +++ b/tests/xfs/116 @@ -36,6 +36,9 @@ _supported_os Linux _require_scratch _require_xfs_quota +# Only mount with the quota options we specify below +_qmount_option "defaults" + _scratch_mkfs >/dev/null 2>&1 _scratch_mount "-o uquota" _scratch_unmount diff --git a/tests/xfs/132 b/tests/xfs/132 index c5fe8b5a..a421f727 100755 --- a/tests/xfs/132 +++ b/tests/xfs/132 @@ -24,6 +24,7 @@ _cleanup() # get standard environment, filters and checks . ./common/rc . ./common/filter +. ./common/quota # remove previous $seqres.full before test rm -f $seqres.full @@ -43,6 +44,10 @@ _disable_dmesg_check _require_xfs_mkfs_crc _scratch_mkfs -m crc=0 > $seqres.full 2>&1 +# The files that EIO in the golden output changes if we have quotas enabled +# so leave it off. +_qmount_option "defaults" + # corrupt an inode in the root inode chunk root_ino=$(_scratch_xfs_get_metadata_field 'rootino' 'sb 0') corrupt_ino=$((root_ino + 15)) diff --git a/tests/xfs/220 b/tests/xfs/220 index 227d5452..61319c9d 100755 --- a/tests/xfs/220 +++ b/tests/xfs/220 @@ -36,6 +36,9 @@ _supported_os Linux _require_scratch _require_quota +# Only mount with the specific quota options mentioned below +_qmount_option "defaults" + echo "Silence is golden." # create scratch filesystem