diff options
| author | Fabricio Voznika <fvoznika@google.com> | 2021-07-13 11:33:49 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-07-13 11:36:13 -0700 |
| commit | c16e69a9d5ec3422b648a6d32842442925285a29 (patch) | |
| tree | f6c7aab2d8c7fb8df0cd607b0b12298fecd231ef /pkg/shim/proc/exec.go | |
| parent | 1fe6db8c542431d3d6e229f563fefbd2f962fc81 (diff) | |
Use consistent naming for subcontainers
It was confusing to find functions relating to root and non-root
containers. Replace "non-root" and "subcontainer" and make naming
consistent in Sandbox and controller.
PiperOrigin-RevId: 384512518
Diffstat (limited to 'pkg/shim/proc/exec.go')
| -rw-r--r-- | pkg/shim/proc/exec.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/shim/proc/exec.go b/pkg/shim/proc/exec.go index e0f2ae6fa..da2e21598 100644 --- a/pkg/shim/proc/exec.go +++ b/pkg/shim/proc/exec.go @@ -113,7 +113,7 @@ func (e *execProcess) Delete(ctx context.Context) error { return e.execState.Delete(ctx) } -func (e *execProcess) delete() error { +func (e *execProcess) delete() { e.wg.Wait() if e.io != nil { for _, c := range e.closers { @@ -121,7 +121,6 @@ func (e *execProcess) delete() error { } e.io.Close() } - return nil } func (e *execProcess) Resize(ws console.WinSize) error { |