[PATCH] common/xfs: add iomap_dio_complete() to the dmesg filter

Eryu Guan
2017-09-29T04:13:58Z

Kernel commit 332391a9935d ("fs: Fix page cache inconsistency when mixing
buffered and AIO DIO") moved the WARN_ON_ONCE() into iomap_dio_complete(),
along with the page cache invalidation. Let's add iomap_dio_complete() to the
filter whitelist too, so this expected warning when mixing direct I/O with
buffered I/O won't fail tests.

Signed-off-by: Eryu Guan <eguan@redhat.com>
---
common/xfs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/xfs b/common/xfs
index def28bfc7309..c869aaca4512 100644
--- a/common/xfs
+++ b/common/xfs
@@ -610,11 +610,13 @@ _filter_xfs_dmesg()
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#$warn7#Intentional warnings in iomap_dio_actor#" \
+ -e "s#$warn8#Intentional warnings in iomap_dio_complete#"
}
--
2.13.6