From: Xiao Yang <yangx.jy@cn.fujitsu.com>
To: <guaneryu@gmail.com>
Cc: <fstests@vger.kernel.org>, <ira.weiny@intel.com>,
<darrick.wong@oracle.com>, Xiao Yang <yangx.jy@cn.fujitsu.com>
Subject: [PATCH v3 1/2] common/dmlogwrites: Update _require_log_writes_dax() for new dax option
Date: Tue, 11 Aug 2020 00:29:08 +0800 [thread overview]
Message-ID: <20200810162909.26665-1-yangx.jy@cn.fujitsu.com> (raw)
1) Rename _require_log_writes_dax to _require_log_writes_dax_mountopt.
2) Make _require_log_writes_dax_mountopt check if old or new dax option
is supported.
3) generic/470 takes use of _require_log_writes_dax_mountopt.
Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
---
V2->V3:
Update comments.
common/dmlogwrites | 24 +++++++++++++++++++-----
tests/generic/470 | 2 +-
2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/common/dmlogwrites b/common/dmlogwrites
index 2a7ff612..573f4b8a 100644
--- a/common/dmlogwrites
+++ b/common/dmlogwrites
@@ -23,7 +23,18 @@ _require_log_writes()
# explicitly. But this is considered as a temporary workaround, we want to move
# all the DAX check back to _require_log_writes when dm-log-writes gains full
# DAX support and remove this helper.
-_require_log_writes_dax()
+#
+# Check if dax mount options are supported
+# $1 can be either 'dax=always' or 'dax'
+# dax=always
+# Check for the new dax options (dax=inode, dax=always or dax=never)
+# by passing "dax=always".
+# dax
+# Check for the old dax or new dax=always by passing "dax".
+# This only accepts 'dax=always' because dax=always, dax=inode and
+# dax=never are always supported together. So if the other options are
+# required checking for 'dax=always' indicates support for the other 2.
+_require_log_writes_dax_mountopt()
{
[ -z "$LOGWRITES_DEV" -o ! -b "$LOGWRITES_DEV" ] && \
_notrun "This test requires a valid \$LOGWRITES_DEV"
@@ -32,16 +43,19 @@ _require_log_writes_dax()
_require_test_program "log-writes/replay-log"
local ret=0
+ local mountopt=$1
+
_log_writes_init $SCRATCH_DEV
_log_writes_mkfs > /dev/null 2>&1
- _log_writes_mount -o dax > /dev/null 2>&1
- # Check options to be sure. XFS ignores dax option
+ _log_writes_mount "-o $mountopt" > /dev/null 2>&1
+ # Check options to be sure.
+ # XFS ignores dax option(or changes it to dax=never)
# and goes on if dev underneath does not support dax.
- _fs_options $LOGWRITES_DMDEV | grep -qw "dax"
+ _fs_options $LOGWRITES_DMDEV | egrep -q "dax(=always|,|$)"
ret=$?
_log_writes_cleanup
if [ $ret -ne 0 ]; then
- _notrun "$LOGWRITES_DMDEV $FSTYP does not support -o dax"
+ _notrun "$LOGWRITES_DMDEV $FSTYP does not support -o $mountopt"
fi
}
diff --git a/tests/generic/470 b/tests/generic/470
index 93691f4a..fd6da563 100755
--- a/tests/generic/470
+++ b/tests/generic/470
@@ -35,7 +35,7 @@ rm -f $seqres.full
_supported_fs generic
_supported_os Linux
_require_scratch
-_require_log_writes_dax
+_require_log_writes_dax_mountopt "dax"
_require_xfs_io_command "mmap" "-S"
_require_xfs_io_command "log_writes"
--
2.21.0
next reply other threads:[~2020-08-10 16:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-10 16:29 Xiao Yang [this message]
2020-08-10 16:29 ` [PATCH v3 2/2] common/rc: Update _exclude_scratch_mount_option() and _require_dm_target() for new dax option Xiao Yang
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=20200810162909.26665-1-yangx.jy@cn.fujitsu.com \
--to=yangx.jy@cn.fujitsu.com \
--cc=darrick.wong@oracle.com \
--cc=fstests@vger.kernel.org \
--cc=guaneryu@gmail.com \
--cc=ira.weiny@intel.com \
/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).