summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-04-12 22:22:58 +0000
committergVisor bot <gvisor-bot@google.com>2021-04-12 22:22:58 +0000
commitbee6d2d33fc8f117aa4a941a436316b0e44eae4d (patch)
treeb27f3b6ecaf612b77bc3a4f8645e7b4b5684827c /pkg/sentry/kernel
parent5dc99694d8de6e814c23ae626d82a8383b7a90e9 (diff)
parentf4f6ce337aa8ceb46a5a8f783efb770c9a8a2858 (diff)
Merge release-20210408.0-23-gf4f6ce337 (automated)
Diffstat (limited to 'pkg/sentry/kernel')
-rw-r--r--pkg/sentry/kernel/kernel.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/kernel.go b/pkg/sentry/kernel/kernel.go
index 9a4fd64cb..e6e9da898 100644
--- a/pkg/sentry/kernel/kernel.go
+++ b/pkg/sentry/kernel/kernel.go
@@ -1854,7 +1854,7 @@ func (k *Kernel) Release() {
func (k *Kernel) PopulateNewCgroupHierarchy(root Cgroup) {
k.tasks.mu.RLock()
k.tasks.forEachTaskLocked(func(t *Task) {
- if t.ExitState() != TaskExitNone {
+ if t.exitState != TaskExitNone {
return
}
t.mu.Lock()
@@ -1870,7 +1870,7 @@ func (k *Kernel) PopulateNewCgroupHierarchy(root Cgroup) {
func (k *Kernel) ReleaseCgroupHierarchy(hid uint32) {
k.tasks.mu.RLock()
k.tasks.forEachTaskLocked(func(t *Task) {
- if t.ExitState() != TaskExitNone {
+ if t.exitState != TaskExitNone {
return
}
t.mu.Lock()