From 9b897c8055508bace23402504792d85b336581c4 Mon Sep 17 00:00:00 2001 From: Eryu Guan Date: Mon, 31 Jul 2017 12:16:33 +0800 Subject: [PATCH] common/xfs: add iomap_dio_actor() to the dmesg filter The warning in fs/iomap.c::iomap_dio_actor() could be triggered when mixing dio and mmap I/O on the same sparse file. Several tests could hit this warning now, like generic/095 generic/224 and generic/446. So add this expected warning to whitelist too. Reviewed-by: Brian Foster Signed-off-by: Eryu Guan --- common/xfs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/xfs b/common/xfs index fd04f65f..8bd34190 100644 --- a/common/xfs +++ b/common/xfs @@ -596,10 +596,12 @@ _filter_xfs_dmesg() 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.*" 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#$warn6#Intentional warnings in __xfs_get_blocks#" \ + -e "s#$warn7#Intentional warnings in iomap_dio_actor#" } -- 2.30.2