From patchwork Tue Feb 10 21:54:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaegeuk Kim X-Patchwork-Id: 5809051 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9F73EBF440 for ; Tue, 10 Feb 2015 21:54:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DD70C201BC for ; Tue, 10 Feb 2015 21:54:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0C22A20154 for ; Tue, 10 Feb 2015 21:54:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754480AbbBJVyp (ORCPT ); Tue, 10 Feb 2015 16:54:45 -0500 Received: from mail.kernel.org ([198.145.29.136]:52399 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754138AbbBJVyo (ORCPT ); Tue, 10 Feb 2015 16:54:44 -0500 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0DEAA20173; Tue, 10 Feb 2015 21:54:44 +0000 (UTC) Received: from localhost (mobile-166-171-249-207.mycingular.net [166.171.249.207]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1B45220154; Tue, 10 Feb 2015 21:54:43 +0000 (UTC) Date: Tue, 10 Feb 2015 13:54:41 -0800 From: Jaegeuk Kim To: Dave Chinner Cc: fstests@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Subject: Re: [PATCH 8/9 v6] xfs/087: give quota mount option per filesystem Message-ID: <20150210215441.GB83208@jaegeuk-mac02.mot.com> References: <1423204633-66673-1-git-send-email-jaegeuk@kernel.org> <1423204633-66673-9-git-send-email-jaegeuk@kernel.org> <20150210060100.GM4251@dastard> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20150210060100.GM4251@dastard> User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Change log from v5: o move function into the test script -- >8 -- This patch add _get_quota_option to assign the mount option selectively. Signed-off-by: Jaegeuk Kim --- tests/xfs/087 | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/tests/xfs/087 b/tests/xfs/087 index 8da0f9c..38be6d5 100755 --- a/tests/xfs/087 +++ b/tests/xfs/087 @@ -53,6 +53,18 @@ _do_meta() fi } +_get_quota_option() +{ + case $FSTYP in + xfs) + _require_xfs_quota + echo "-o uquota" + ;; + *) + ;; + esac +} + # real QA test starts here _supported_fs xfs _supported_os IRIX Linux @@ -62,7 +74,8 @@ _require_scratch _require_scratch_shutdown _require_logstate _require_v2log -_require_xfs_quota + +QUOTA_OPTION=`_get_quota_option` echo "*** init FS" umount $SCRATCH_DEV >/dev/null 2>&1 @@ -90,7 +103,7 @@ do # mount the FS _echofull "mount" - if ! _scratch_mount -o uquota >>$seqres.full 2>&1; then + if ! _scratch_mount $QUOTA_OPTION >>$seqres.full 2>&1; then _echofull "mount failed: $MOUNT_OPTIONS" continue fi @@ -116,7 +129,7 @@ do _scratch_xfs_logprint -n >>$seqres.full 2>&1 _echofull "mount with replay" - _scratch_mount -o uquota >>$seqres.full 2>&1 \ + _scratch_mount $QUOTA_OPTION >>$seqres.full 2>&1 \ || _fail "mount failed: $MOUNT_OPTIONS" # check on what FS looks like after log recovery