From patchwork Wed Dec 21 03:26:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eryu Guan X-Patchwork-Id: 9482459 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 3356A60772 for ; Wed, 21 Dec 2016 03:27:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 18750280FC for ; Wed, 21 Dec 2016 03:27:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D31A28161; Wed, 21 Dec 2016 03:27:26 +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 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 ACA84280FC for ; Wed, 21 Dec 2016 03:27:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756937AbcLUD1Z (ORCPT ); Tue, 20 Dec 2016 22:27:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56194 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754026AbcLUD1Y (ORCPT ); Tue, 20 Dec 2016 22:27:24 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5781D83F47 for ; Wed, 21 Dec 2016 03:27:24 +0000 (UTC) Received: from localhost (vpn1-7-30.pek2.redhat.com [10.72.7.30]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uBL3RMRa001290; Tue, 20 Dec 2016 22:27:23 -0500 From: Eryu Guan To: fstests@vger.kernel.org Cc: sandeen@redhat.com, Eryu Guan Subject: [PATCH] Revert "generic/38[3-6]: require project quota to be enabled on SCRATCH_DEV" Date: Wed, 21 Dec 2016 11:26:54 +0800 Message-Id: <20161221032654.24197-1-eguan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 21 Dec 2016 03:27:24 +0000 (UTC) Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 23f60ef304d ("generic/38[3-6]: require project quota to be enabled on SCRATCH_DEV") introduced a regression that leads _require_projquota, which uses src/feature to call a quotactl, operate before the filesystem is mounted, and results in tests not run on XFS and ext4. Revert the problematic patch first, because don't want to lose project quota test coverage on XFS and ext4. We can fix the false failure on ext3/2 later, Reported-by: Eric Sandeen Signed-off-by: Eryu Guan Reviewed-by: Eric Sandeen --- tests/generic/383 | 1 - tests/generic/384 | 2 +- tests/generic/385 | 2 +- tests/generic/386 | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/generic/383 b/tests/generic/383 index 93836ea..be5b19b 100755 --- a/tests/generic/383 +++ b/tests/generic/383 @@ -54,7 +54,6 @@ _require_xfs_quota_foreign _scratch_mkfs >/dev/null 2>&1 _scratch_enable_pquota -_require_prjquota $SCRATCH_DEV do_project_test() { diff --git a/tests/generic/384 b/tests/generic/384 index 4784e47..452d26e 100755 --- a/tests/generic/384 +++ b/tests/generic/384 @@ -73,10 +73,10 @@ chmod a+rwx $seqres.full # arbitrary users will write here _require_scratch _scratch_mkfs >/dev/null 2>&1 _scratch_enable_pquota -_require_prjquota $SCRATCH_DEV _qmount_option "prjquota" _qmount +_require_prjquota $SCRATCH_DEV report_quota() { diff --git a/tests/generic/385 b/tests/generic/385 index b7c5bd3..f07ae5d 100755 --- a/tests/generic/385 +++ b/tests/generic/385 @@ -71,9 +71,9 @@ quota_cmd="$XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid" _scratch_mkfs >/dev/null 2>&1 _scratch_enable_pquota -_require_prjquota $SCRATCH_DEV _qmount_option "prjquota" _qmount +_require_prjquota $SCRATCH_DEV # # Create the project root diff --git a/tests/generic/386 b/tests/generic/386 index 0ceb14d..3aede60 100755 --- a/tests/generic/386 +++ b/tests/generic/386 @@ -127,10 +127,10 @@ echo $proj_num:$proj_dir > "$my_projects" _scratch_mkfs >> "$seqres.full" 2>&1 _scratch_enable_pquota -_require_prjquota $SCRATCH_DEV _qmount_option "prjquota" _qmount +_require_prjquota $SCRATCH_DEV mkdir -p "${proj_dir}"