From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx1.redhat.com ([209.132.183.28]:57984 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750748AbdI2EN6 (ORCPT ); Fri, 29 Sep 2017 00:13:58 -0400 From: Eryu Guan Subject: [PATCH] common/xfs: add iomap_dio_complete() to the dmesg filter Date: Fri, 29 Sep 2017 12:13:27 +0800 Message-Id: <20170929041327.1346-1-eguan@redhat.com> Sender: fstests-owner@vger.kernel.org To: fstests@vger.kernel.org Cc: linux-xfs@vger.kernel.org, Eryu Guan List-ID: 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. Signed-off-by: Eryu Guan --- common/xfs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/xfs b/common/xfs index def28bfc7309..c869aaca4512 100644 --- a/common/xfs +++ b/common/xfs @@ -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#" } -- 2.13.6