diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-05-28 21:51:39 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-05-28 21:51:39 +0000 |
| commit | 78d4cf6d3a7ce48cd011909c4a5bc2b7cd44e139 (patch) | |
| tree | 79d8f9ddd1fad7979765bf38fa8a9c8857b7ad52 /runsc/cgroup | |
| parent | 8863131d5411013637268f05bd944128898e42af (diff) | |
| parent | f7418e21590e271302a3c375323950c209ce5ced (diff) | |
Merge release-20200522.0-25-gf7418e21 (automated)
Diffstat (limited to 'runsc/cgroup')
| -rw-r--r-- | runsc/cgroup/cgroup.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runsc/cgroup/cgroup.go b/runsc/cgroup/cgroup.go index 19c8b0db6..ef01820ef 100644 --- a/runsc/cgroup/cgroup.go +++ b/runsc/cgroup/cgroup.go @@ -31,8 +31,8 @@ import ( "github.com/cenkalti/backoff" specs "github.com/opencontainers/runtime-spec/specs-go" + "gvisor.dev/gvisor/pkg/cleanup" "gvisor.dev/gvisor/pkg/log" - "gvisor.dev/gvisor/runsc/specutils" ) const ( @@ -246,7 +246,7 @@ func (c *Cgroup) Install(res *specs.LinuxResources) error { // The Cleanup object cleans up partially created cgroups when an error occurs. // Errors occuring during cleanup itself are ignored. - clean := specutils.MakeCleanup(func() { _ = c.Uninstall() }) + clean := cleanup.Make(func() { _ = c.Uninstall() }) defer clean.Clean() for key, cfg := range controllers { |