From: Xiao Yang Date: Mon, 3 Jul 2017 07:35:59 +0000 (+0800) Subject: generic/446: add __xfs_get_blocks() into _filter_xfs_dmesg X-Git-Tag: v2022.05.01~1982 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=65fd511691aca15eb61eb916ce62239626cfbc1c;p=xfstests-dev.git 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 Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- diff --git a/common/xfs b/common/xfs index 77100f73..a1ee3847 100644 --- 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#" }