summaryrefslogtreecommitdiffhomepage
path: root/pkg/shim/proc/exec_state.go
diff options
context:
space:
mode:
authorFabricio Voznika <fvoznika@google.com>2021-07-13 11:33:49 -0700
committergVisor bot <gvisor-bot@google.com>2021-07-13 11:36:13 -0700
commitc16e69a9d5ec3422b648a6d32842442925285a29 (patch)
treef6c7aab2d8c7fb8df0cd607b0b12298fecd231ef /pkg/shim/proc/exec_state.go
parent1fe6db8c542431d3d6e229f563fefbd2f962fc81 (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_state.go')
-rw-r--r--pkg/shim/proc/exec_state.go8
1 files changed, 2 insertions, 6 deletions
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
}