On Wed, Jun 29, 2016 at 09:20:58AM -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>
Reviewed-by: Eryu Guan <eguan@xxxxxxxxxx>
> ---
> 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
>
> --
> 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
--
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
