From patchwork Thu Oct 12 14:54:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 10002149 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 80FA560216 for ; Thu, 12 Oct 2017 14:54:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 72FEC28D54 for ; Thu, 12 Oct 2017 14:54:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6666A28D43; Thu, 12 Oct 2017 14:54:23 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 09E5C28D43 for ; Thu, 12 Oct 2017 14:54:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751901AbdJLOyW (ORCPT ); Thu, 12 Oct 2017 10:54:22 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:56233 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751829AbdJLOyW (ORCPT ); Thu, 12 Oct 2017 10:54:22 -0400 Received: by mail-wm0-f67.google.com with SMTP id u138so14197659wmu.4 for ; Thu, 12 Oct 2017 07:54:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xHdjTi1ts8u2K8wWB3PxYs0mqD5y064ToEp5SzxWPQ8=; b=oQnXx7i7EdCsd6lMG0j/DWxgbgGDqUw/HvwCB1Elh2B0AJM8iZUFGz8m0AK3PzKNi1 KBrL18diglKK2Hp2MXABQ5jvo0duP2OYxpzoDFJO4FFGUNW0KxAswnMRUOjA050GZacu rUVt0ss+cVPRzlzrQxo19+mmBy5O/88W33mXdgMFwNooY2T9PBqTvtQLVqbZ0tc0nlgC A/Gdd9HrO1nFqMWYRt6yDjXuGkU1hkomXZsAnzOOzz0vpEFGbtpPzXUn/4PdzK2xQuCZ asz8lXkoHuvgvXoqM8DOYrINWvg/jOv3VcjPUCH4NZDhgpdumYaOs4TWnqhZ9iQ6n7mi EDLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xHdjTi1ts8u2K8wWB3PxYs0mqD5y064ToEp5SzxWPQ8=; b=VuCbYdl0JUelvo5/Q7xj+70bkNzU6GKz/7WpZFGNTWNMm+0TI+3COWlQCcCa/TSFL+ IZwYfJPrSDyUK9e7DKzchzSvYxMWkuFkL0n1k8BN00U2Kgj+GY5nmQQMv2+xn24o8tcJ e0ZMSzKwyf/RAUsZeBW7s3bJhI2F4V9TlMcz1hbMpZ+AbDwhYsTx1xGIdbI+qurj5246 XBKZBEEYoCSx9JPr1xFNn71J+CKh8OGQ+EVMpHZltdAEDFWvo+ASeAweYEaEYfz1itZc rxOnPU3ZH1LXBNCbQ3msyf06Tfi+iVDV5VQQdpLwcbGiWplthl5t6yAd8by8DrCXQAfx /3WQ== X-Gm-Message-State: AMCzsaVYhuqJbuVmyIApnEL/P6Sgof2clsJM4aZMRNt3tLPwmZa1dFn3 oymcoe6E2q4bofglk2Nervj+gG2A X-Google-Smtp-Source: AOwi7QCIIeE0IMK7G6yikychKn8O7+TcWthgUWAxsumPjLTrQRs0aXz/fThwRzQ5JkqrJuZi4oMKTw== X-Received: by 10.80.204.72 with SMTP id n8mr3216523edi.122.1507820060732; Thu, 12 Oct 2017 07:54:20 -0700 (PDT) Received: from orange.redhat.com ([213.175.37.12]) by smtp.gmail.com with ESMTPSA id c25sm14090850edb.28.2017.10.12.07.54.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Oct 2017 07:54:19 -0700 (PDT) From: Ilya Dryomov To: fstests@vger.kernel.org Cc: Lukas Czerner Subject: [PATCH v2 1/3] common: move _filter_xfs_dmesg() to common/filter Date: Thu, 12 Oct 2017 16:54:02 +0200 Message-Id: <1507820044-2161-2-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1507820044-2161-1-git-send-email-idryomov@gmail.com> References: <1507820044-2161-1-git-send-email-idryomov@gmail.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Ilya Dryomov --- common/filter | 23 +++++++++++++++++++++++ common/xfs | 22 ---------------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/common/filter b/common/filter index 39ea140cb60f..441ee1a6e490 100644 --- a/common/filter +++ b/common/filter @@ -448,5 +448,28 @@ _filter_filefrag() $flags, "\n"' } +# xfs generates WARNINGs on purpose when applications mix buffered/mmap IO with +# direct IO on the same file. This is a helper for _check_dmesg() to filter out +# such warnings. +_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_dio_aio_read.*" + 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.*" + 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#$warn8#Intentional warnings in iomap_dio_complete#" +} + # make sure this script returns success /bin/true diff --git a/common/xfs b/common/xfs index 93eb50394984..d4fef941d321 100644 --- a/common/xfs +++ b/common/xfs @@ -599,25 +599,3 @@ _require_no_xfs_debug() _notrun "Require XFS built without CONFIG_XFS_DEBUG" fi } -# xfs generates WARNINGs on purpose when applications mix buffered/mmap IO with -# direct IO on the same file. This is a helper for _check_dmesg() to filter out -# such warnings. -_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_dio_aio_read.*" - 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.*" - 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#$warn8#Intentional warnings in iomap_dio_complete#" -}