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

2 files changed, 3 insertions, 8 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 {
diff --git a/pkg/shim/proc/exec_state.go b/pkg/shim/proc/exec_state.go
index 8d8ecf541..03ecb401a 100644
--- a/pkg/shim/proc/exec_state.go
+++ b/pkg/shim/proc/exec_state.go
@@ -64,9 +64,7 @@ func (s *execCreatedState) Start(ctx context.Context) error {
 }
 
 func (s *execCreatedState) Delete(context.Context) error {
-	if err := s.p.delete(); err != nil {
-		return err
-	}
+	s.p.delete()
 	s.transition(deleted)
 	return nil
 }
@@ -144,9 +142,7 @@ func (s *execStoppedState) Start(context.Context) error {
 }
 
 func (s *execStoppedState) Delete(context.Context) error {
-	if err := s.p.delete(); err != nil {
-		return err
-	}
+	s.p.delete()
 	s.transition(deleted)
 	return nil
 }