On Tue, Jun 28, 2016 at 09:33:07PM -0400, Theodore Ts'o wrote: > 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@xxxxxxx> > --- > tests/generic/082 | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tests/generic/082 b/tests/generic/082 > index a727c10..fa61ba9 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" > } Functions starting with "_" denote common scope functions (i.e. from externally sourced files), not local test functions. Just remove the "_" prefix here.... Cheers, Dave. -- Dave Chinner david@xxxxxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html