From: Ilya Dryomov <idryomov@gmail.com>
To: fstests@vger.kernel.org
Cc: Lukas Czerner <lczerner@redhat.com>
Subject: [PATCH 1/3] common/rc: move _filter_xfs_dmesg() to common/rc
Date: Tue, 10 Oct 2017 16:54:56 +0200 [thread overview]
Message-ID: <1507647298-9971-2-git-send-email-idryomov@gmail.com> (raw)
In-Reply-To: <1507647298-9971-1-git-send-email-idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---
common/rc | 23 +++++++++++++++++++++++
common/xfs | 22 ----------------------
2 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/common/rc b/common/rc
index 53bbb1187f81..e15c8fc27405 100644
--- a/common/rc
+++ b/common/rc
@@ -2027,6 +2027,29 @@ _run_aiodio()
return $status
}
+# xfs generates WARNINGs on purpose when applications mix buffered/mmap IO with
+# direct IO on the same file. This is a helper for _check_dmesg() to filter out
+# such warnings.
+_filter_xfs_dmesg()
+{
+ local warn1="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_dio_aio_write.*"
+ local warn2="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_dio_aio_read.*"
+ local warn3="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_read_iter.*"
+ local warn4="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_aio_read.*"
+ local warn5="WARNING:.*fs/iomap\.c:.*iomap_dio_rw.*"
+ local warn6="WARNING:.*fs/xfs/xfs_aops\.c:.*__xfs_get_blocks.*"
+ local warn7="WARNING:.*fs/iomap\.c:.*iomap_dio_actor.*"
+ local warn8="WARNING:.*fs/iomap\.c:.*iomap_dio_complete.*"
+ sed -e "s#$warn1#Intentional warnings in xfs_file_dio_aio_write#" \
+ -e "s#$warn2#Intentional warnings in xfs_file_dio_aio_read#" \
+ -e "s#$warn3#Intentional warnings in xfs_file_read_iter#" \
+ -e "s#$warn4#Intentional warnings in xfs_file_aio_read#" \
+ -e "s#$warn5#Intentional warnings in iomap_dio_rw#" \
+ -e "s#$warn6#Intentional warnings in __xfs_get_blocks#" \
+ -e "s#$warn7#Intentional warnings in iomap_dio_actor#" \
+ -e "s#$warn8#Intentional warnings in iomap_dio_complete#"
+}
+
# this test requires y2038 sysfs switch and filesystem
# timestamp ranges support.
_require_y2038()
diff --git a/common/xfs b/common/xfs
index 93eb50394984..d4fef941d321 100644
--- a/common/xfs
+++ b/common/xfs
@@ -599,25 +599,3 @@ _require_no_xfs_debug()
_notrun "Require XFS built without CONFIG_XFS_DEBUG"
fi
}
-# xfs generates WARNINGs on purpose when applications mix buffered/mmap IO with
-# direct IO on the same file. This is a helper for _check_dmesg() to filter out
-# such warnings.
-_filter_xfs_dmesg()
-{
- local warn1="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_dio_aio_write.*"
- local warn2="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_dio_aio_read.*"
- local warn3="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_read_iter.*"
- local warn4="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_aio_read.*"
- local warn5="WARNING:.*fs/iomap\.c:.*iomap_dio_rw.*"
- local warn6="WARNING:.*fs/xfs/xfs_aops\.c:.*__xfs_get_blocks.*"
- local warn7="WARNING:.*fs/iomap\.c:.*iomap_dio_actor.*"
- local warn8="WARNING:.*fs/iomap\.c:.*iomap_dio_complete.*"
- sed -e "s#$warn1#Intentional warnings in xfs_file_dio_aio_write#" \
- -e "s#$warn2#Intentional warnings in xfs_file_dio_aio_read#" \
- -e "s#$warn3#Intentional warnings in xfs_file_read_iter#" \
- -e "s#$warn4#Intentional warnings in xfs_file_aio_read#" \
- -e "s#$warn5#Intentional warnings in iomap_dio_rw#" \
- -e "s#$warn6#Intentional warnings in __xfs_get_blocks#" \
- -e "s#$warn7#Intentional warnings in iomap_dio_actor#" \
- -e "s#$warn8#Intentional warnings in iomap_dio_complete#"
-}
--
2.4.3
next prev parent reply other threads:[~2017-10-10 14:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-10 14:54 [PATCH 0/3] generalize AIO/DIO dmesg filter Ilya Dryomov
2017-10-10 14:54 ` Ilya Dryomov [this message]
2017-10-11 5:35 ` [PATCH 1/3] common/rc: move _filter_xfs_dmesg() to common/rc Dave Chinner
2017-10-10 14:54 ` [PATCH 2/3] common/rc: turn _filter_xfs_dmesg() into _filter_aiodio_dmesg() Ilya Dryomov
2017-10-10 14:54 ` [PATCH 3/3] generic/036,208: whitelist [iomap_]dio_complete() WARNs Ilya Dryomov
2017-10-12 4:25 ` [PATCH 0/3] generalize AIO/DIO dmesg filter Eryu Guan
2017-10-12 7:19 ` Ilya Dryomov
2017-10-12 7:25 ` Eryu Guan
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=1507647298-9971-2-git-send-email-idryomov@gmail.com \
--to=idryomov@gmail.com \
--cc=fstests@vger.kernel.org \
--cc=lczerner@redhat.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