From patchwork Mon Aug 1 09:02:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9253895 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E143C60865 for ; Mon, 1 Aug 2016 09:03:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF1F7223B2 for ; Mon, 1 Aug 2016 09:03:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BF97A28494; Mon, 1 Aug 2016 09:03:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2FE8A223B2 for ; Mon, 1 Aug 2016 09:03:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752100AbcHAJDA (ORCPT ); Mon, 1 Aug 2016 05:03:00 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:57275 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752065AbcHAJDA (ORCPT ); Mon, 1 Aug 2016 05:03:00 -0400 Received: from [83.175.99.196] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.85_2 #1 (Red Hat Linux)) id 1bU97j-00030G-4v; Mon, 01 Aug 2016 09:02:59 +0000 From: Christoph Hellwig To: fstests@vger.kernel.org Cc: xfs@oss.sgi.com Subject: [PATCH] generic/095: update warning whitelist Date: Mon, 1 Aug 2016 11:02:56 +0200 Message-Id: <1470042176-31447-1-git-send-email-hch@lst.de> X-Mailer: git-send-email 2.1.4 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Dave Chinner --- tests/generic/095 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/generic/095 b/tests/generic/095 index c656ef1..4754992 100755 --- a/tests/generic/095 +++ b/tests/generic/095 @@ -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