From patchwork Wed Jun 29 13:20:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Theodore Ts'o X-Patchwork-Id: 9205091 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 2396E607D8 for ; Wed, 29 Jun 2016 13:22:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 15A2328665 for ; Wed, 29 Jun 2016 13:22:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A3FC28668; Wed, 29 Jun 2016 13:22:58 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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 74AD628665 for ; Wed, 29 Jun 2016 13:22:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752043AbcF2NWE (ORCPT ); Wed, 29 Jun 2016 09:22:04 -0400 Received: from imap.thunk.org ([74.207.234.97]:38584 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752652AbcF2NVF (ORCPT ); Wed, 29 Jun 2016 09:21:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=thunk.org; s=ef5046eb; h=Message-Id:Date:Subject:Cc:To:From; bh=PTghRAiYUI2zU+XyiwkAjls4bnVqBVXTIGMp+DfewCE=; b=utAL+ZyP9xcaklZ+gfpRI5K0RX7GSshOmnmxI91H7GGSQgK+5Qd+Ldxs1q7hMaaeZJA6JrOWoBquBrjG0SUM95p56Q27+qzIK7X9Zna7tXaI0YaRLa7jMpCmnlpzA6jzy+rQXm02RTLD+1g8CsSy0P49qAy34+smfsAfReuZeJE=; Received: from root (helo=closure.thunk.org) by imap.thunk.org with local-esmtp (Exim 4.84_2) (envelope-from ) id 1bIFQO-0003om-HN; Wed, 29 Jun 2016 13:21:04 +0000 Received: by closure.thunk.org (Postfix, from userid 15806) id CC85782F0D1; Wed, 29 Jun 2016 09:21:03 -0400 (EDT) From: Theodore Ts'o To: fstests@vger.kernel.org Cc: Theodore Ts'o Subject: [PATCH -v2] generic/082: rename _filter_project_quota to a avoid function name conflict Date: Wed, 29 Jun 2016 09:20:58 -0400 Message-Id: <1467206458-2277-1-git-send-email-tytso@mit.edu> X-Mailer: git-send-email 2.5.0 X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: tytso@thunk.org X-SA-Exim-Scanned: No (on imap.thunk.org); SAEximRunCond expanded to false Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 8469a8c1: "xfs/133-4: filter redundant projid 0 quota report info out" added _filter_project_quota to common/filter, and this conflicted with a _filter_project_quota function in generic/082. So rename the function in generic/082 to avoid the conflict. Signed-off-by: Theodore Ts'o Reviewed-by: Eryu Guan --- tests/generic/082 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/generic/082 b/tests/generic/082 index a727c10..a41afe6 100755 --- a/tests/generic/082 +++ b/tests/generic/082 @@ -36,9 +36,9 @@ _cleanup() rm -f $tmp.* } -_filter_project_quota() +filter_project_quota_line() { - grep -v "^project quota on" + grep -v "^project quota on" } # get standard environment, filters and checks @@ -69,7 +69,7 @@ quotaon $SCRATCH_MNT >>$seqres.full 2>&1 # just ignored, but quota is still on. This may change in future, let's # re-consider the case then. _scratch_mount "-o remount,ro,nosuchopt" >>$seqres.full 2>&1 -quotaon -p $SCRATCH_MNT | _filter_scratch | _filter_project_quota +quotaon -p $SCRATCH_MNT | _filter_scratch | filter_project_quota_line # second remount should succeed, no oops or hang expected _scratch_mount "-o remount,ro" || _fail "second remount,ro failed"