From: Jaegeuk Kim <jaegeuk@kernel.org>
To: Dave Chinner <david@fromorbit.com>
Cc: fstests@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net,
Jaegeuk Kim <jaegeuk@kernel.org>
Subject: [PATCH 8/9 v5] common/quota: give quota mount option per filesystem
Date: Thu, 5 Feb 2015 22:37:12 -0800 [thread overview]
Message-ID: <1423204633-66673-9-git-send-email-jaegeuk@kernel.org> (raw)
In-Reply-To: <1423204633-66673-1-git-send-email-jaegeuk@kernel.org>
This patch add _get_quota_option to assign the mount option selectively
in:
tests/xfs/087
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
common/quota | 15 +++++++++++++++
tests/xfs/087 | 7 ++++---
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/common/quota b/common/quota
index b320cf2..a103826 100644
--- a/common/quota
+++ b/common/quota
@@ -78,6 +78,21 @@ _require_xfs_quota()
}
#
+# give quota option accoring to the filesystems.
+#
+_get_quota_option()
+{
+ case $FSTYP in
+ xfs)
+ _require_xfs_quota
+ echo "-o uquota"
+ ;;
+ *)
+ ;;
+ esac
+}
+
+#
# checks that the XFS project quota support in the kernel is enabled.
#
_require_prjquota()
diff --git a/tests/xfs/087 b/tests/xfs/087
index 8da0f9c..2fd6f1a 100755
--- a/tests/xfs/087
+++ b/tests/xfs/087
@@ -62,7 +62,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 +91,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 +117,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
--
2.1.1
next prev parent reply other threads:[~2015-02-06 6:37 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-06 6:37 [PATCH 0/9 v5] make xfs/tests generic by introducing shutdown for filesystems Jaegeuk Kim
2015-02-06 6:37 ` [PATCH 1/9 v5] common/rc: add _require_scratch_shtudown Jaegeuk Kim
2015-02-06 6:37 ` [PATCH 2/9 v5] common/rc: add _require_fiemap and _extent_hole_counts Jaegeuk Kim
2015-02-10 5:47 ` Dave Chinner
2015-02-10 21:52 ` [PATCH 2/9 v6] common/rc: add _require_fiemap and counting extents and holes Jaegeuk Kim
2015-02-06 6:37 ` [PATCH 3/9 v5] common/rc: add _require_norecovery Jaegeuk Kim
2015-02-06 6:37 ` [PATCH 4/9 v5] tests/generic: relocate xfs's tests into tests/generic/ Jaegeuk Kim
2015-02-06 6:37 ` [PATCH 5/9 v5] common/log: define _require_logstate Jaegeuk Kim
2015-02-06 6:37 ` [PATCH 6/9 v5] xfs/086,087: remove specific testing options in output Jaegeuk Kim
2015-02-06 6:37 ` [PATCH 7/9 v5] common/log: add _get_log_configs for testing options Jaegeuk Kim
2015-02-06 6:37 ` Jaegeuk Kim [this message]
2015-02-10 6:01 ` [PATCH 8/9 v5] common/quota: give quota mount option per filesystem Dave Chinner
2015-02-10 21:54 ` [PATCH 8/9 v6] xfs/087: " Jaegeuk Kim
2015-02-06 6:37 ` [PATCH 9/9 v5] tests/generic: relocate xfs's tests into tests/generic/ Jaegeuk Kim
2015-02-10 6:04 ` [PATCH 0/9 v5] make xfs/tests generic by introducing shutdown for filesystems Dave Chinner
2015-02-10 21:55 ` Jaegeuk Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1423204633-66673-9-git-send-email-jaegeuk@kernel.org \
--to=jaegeuk@kernel.org \
--cc=david@fromorbit.com \
--cc=fstests@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).