generic/446: add __xfs_get_blocks() into _filter_xfs_dmesg

On xfs filesystem, the following patch fixed system crash caused by
this race, but it introduced the __xfs_get_blocks() warning when the
race occurred:
04197b3 ("xfs: don't BUG() on mixed direct and mapped I/O")

On upstream kernel, the fix patch was cleared by:
acdda3a ("xfs: use iomap_dio_rw")

When the fix patch was applied and not cleared(e.g, on RHEL7.4),
this case triggered the __xfs_get_blocks() warning as expected.
Moreover, generic/095 may reproduce the same warning occasionally.
So we could add __xfs_get_blocks() into _filter_xfs_dmesg.

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>

diff --git a/common/xfs b/common/xfs
index 77100f7389a7377a72a34e6b069ee85a82e9c0ec..a1ee384786bb69c09737463eb32ac49a12458e88 100644 (file)
--- a/common/xfs
+++ b/common/xfs
@@ -595,9 +595,11 @@ _filter_xfs_dmesg()
        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.*"
        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#$warn5#Intentional warnings in iomap_dio_rw#" \
+           -e "s#$warn6#Intentional warnings in __xfs_get_blocks#"
 }