]> git.apps.os.sepia.ceph.com Git - xfstests-dev.git/commitdiff
generic/082: rename _filter_project_quota to a avoid function name conflict
authorTheodore Ts'o <tytso@mit.edu>
Wed, 29 Jun 2016 13:20:58 +0000 (09:20 -0400)
committerEryu Guan <eguan@redhat.com>
Fri, 1 Jul 2016 03:17:08 +0000 (11:17 +0800)
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>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
tests/generic/082

index a727c10623d2de1cb41fd828202342a91bb2d916..a41afe6e6d20a571e6dbb7224baccc3ce8446274 100755 (executable)
@@ -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"