]> git.apps.os.sepia.ceph.com Git - xfstests-dev.git/commitdiff
common/xfs: add iomap_dio_complete() to the dmesg filter
authorEryu Guan <eguan@redhat.com>
Fri, 29 Sep 2017 04:05:41 +0000 (12:05 +0800)
committerEryu Guan <eguan@redhat.com>
Sun, 1 Oct 2017 11:24:21 +0000 (19:24 +0800)
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.

Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
common/xfs

index def28bfc73090ca557e0c4dc7b1e275059cc10f9..c869aaca45128837cb866c648b9dae383f534f0c 100644 (file)
@@ -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#"
 }