diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-11 13:23:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-11 13:23:56 +0200 |
| commit | e38001f123a04f905a37bf038b2c983ebe350996 (patch) | |
| tree | 676a610092ba152a81d35868523d3c5609baaa5b /vendor/github.com/opencontainers/selinux/pkg | |
| parent | 88b8d2829ced423593f40030c04662ee596740b7 (diff) | |
| parent | e7085599f529f68534231b46fa95e885e68099f4 (diff) | |
| download | podman-e38001f123a04f905a37bf038b2c983ebe350996.tar.gz podman-e38001f123a04f905a37bf038b2c983ebe350996.tar.bz2 podman-e38001f123a04f905a37bf038b2c983ebe350996.zip | |
Merge pull request #6926 from containers/dependabot/go_modules/github.com/containers/storage-1.21.0
Bump github.com/containers/storage from 1.20.2 to 1.21.0
Diffstat (limited to 'vendor/github.com/opencontainers/selinux/pkg')
| -rw-r--r-- | vendor/github.com/opencontainers/selinux/pkg/pwalk/pwalk.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vendor/github.com/opencontainers/selinux/pkg/pwalk/pwalk.go b/vendor/github.com/opencontainers/selinux/pkg/pwalk/pwalk.go index 2ee0d0150..63fde1842 100644 --- a/vendor/github.com/opencontainers/selinux/pkg/pwalk/pwalk.go +++ b/vendor/github.com/opencontainers/selinux/pkg/pwalk/pwalk.go @@ -48,7 +48,11 @@ func WalkN(root string, walkFn WalkFunc, num int) error { errCh := make(chan error, 1) // get the first error, ignore others // Start walking a tree asap - var err error + var ( + err error + wg sync.WaitGroup + ) + wg.Add(1) go func() { err = filepath.Walk(root, func(p string, info os.FileInfo, err error) error { if err != nil { @@ -68,9 +72,9 @@ func WalkN(root string, walkFn WalkFunc, num int) error { if err == nil { close(files) } + wg.Done() }() - var wg sync.WaitGroup wg.Add(num) for i := 0; i < num; i++ { go func() { |