public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
From: "Theodore Ts'o" <tytso@mit.edu>
To: fstests@vger.kernel.org
Cc: Theodore Ts'o <tytso@mit.edu>
Subject: [PATCH -v2] generic/082: rename _filter_project_quota to a avoid function name conflict
Date: Wed, 29 Jun 2016 09:20:58 -0400	[thread overview]
Message-ID: <1467206458-2277-1-git-send-email-tytso@mit.edu> (raw)

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 <tytso@mit.edu>
---
 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"
 
-- 
2.5.0


             reply	other threads:[~2016-06-29 13:21 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-29 13:20 Theodore Ts'o [this message]
2016-06-29 13:29 ` [PATCH -v2] generic/082: rename _filter_project_quota to a avoid function name conflict Eryu Guan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1467206458-2277-1-git-send-email-tytso@mit.edu \
    --to=tytso@mit.edu \
    --cc=fstests@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox