From patchwork Wed Jul 4 04:51:00 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: 10505827 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 03FF9600F5 for ; Wed, 4 Jul 2018 04:51:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E212F28C40 for ; Wed, 4 Jul 2018 04:51:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D49AF28C77; Wed, 4 Jul 2018 04:51:08 +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 6A74A28C40 for ; Wed, 4 Jul 2018 04:51:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932359AbeGDEvG (ORCPT ); Wed, 4 Jul 2018 00:51:06 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:49386 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932439AbeGDEvD (ORCPT ); Wed, 4 Jul 2018 00:51:03 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w644oAZs027188; Wed, 4 Jul 2018 04:51:02 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-2017-10-26; bh=kFn1oG2AdJt+T9Hm9KLBdKaPTnNNdinJjKjGMnQwM0g=; b=OUwJKC3meflrf+/5POctqIwdku95GJ+pCdWZf9sluUXKPho3jkHBbDrEaqhDRYGR1kHA pgXFLtTb25yy0OfKHPseys0Ik/rshj3q73zv1VhNba8EV9Xcvh7IHKI4ebJaxg38Um6o eSjD2TJE42gYL2XTxTTn6qg6KhdnAEzban1QtBx192z1m5u1u57PVRcJvbXeuF1OCpvq olpGqBbjunhnY96Z4SMtfaDEC/Eemvs3pM00VJQv5U7owFCEKtFqM5N2q2d7RIp8kvv6 VtV7kbAuW87+P3RabFPFiAt9S+8ToljJvdw9lF5QMM/CIeZYaoFFOP2QcGmawYvHfBkX 4Q== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp2130.oracle.com with ESMTP id 2k0dnjh8qm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 04 Jul 2018 04:51:02 +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 w644p1PB024377 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 4 Jul 2018 04:51:01 GMT Received: from abhmp0011.oracle.com (abhmp0011.oracle.com [141.146.116.17]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w644p1PP009603; Wed, 4 Jul 2018 04:51:01 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 03 Jul 2018 21:51:01 -0700 Subject: [PATCH 2/7] 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: Tue, 03 Jul 2018 21:51:00 -0700 Message-ID: <153067986006.28393.12507727179398690195.stgit@magnolia> In-Reply-To: <153067984748.28393.1595618163831671652.stgit@magnolia> References: <153067984748.28393.1595618163831671652.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8943 signatures=668704 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-1806210000 definitions=main-1807040056 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 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(+) -- 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/generic/230 b/tests/generic/230 index bc8c1ad0..a7ab67f7 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" quotacheck -u -g $SCRATCH_MNT 2>/dev/null 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