]> www.infradead.org Git - users/hch/xfstests-dev.git/commitdiff
generic/095: update warning whitelist
authorChristoph Hellwig <hch@lst.de>
Mon, 1 Aug 2016 09:02:56 +0000 (11:02 +0200)
committerEryu Guan <eguan@redhat.com>
Wed, 3 Aug 2016 02:56:22 +0000 (10:56 +0800)
The recent direct I/O path refactor changed the function name in the
racing read case.  Update the test case to handle the new name in
addition to the old one.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
tests/generic/095

index c656ef12f4aed6123e32e243b50896708b16502f..47549928ad5743a9acd97c77f98504efdd9a511f 100755 (executable)
@@ -125,9 +125,11 @@ $FIO_PROG $fio_config >>$seqres.full 2>&1
 filter_xfs_dmesg()
 {
        local warn1="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_dio_aio_write.*"
-       local warn2="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_read_iter.*"
+       local warn2="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_dio_aio_read.*"
+       local warn3="WARNING:.*fs/xfs/xfs_file\.c:.*xfs_file_read_iter.*"
        sed -e "s#$warn1#Intentional warnings in xfs_file_dio_aio_write#" \
-           -e "s#$warn2#Intentional warnings in xfs_file_read_iter#"
+           -e "s#$warn2#Intentional warnings in xfs_file_dio_aio_read#" \
+           -e "s#$warn3#Intentional warnings in xfs_file_read_iter#"
 }
 
 # umount before checking dmesg in case umount triggers any WARNING or Oops