diff options
author | gVisor bot <gvisor-bot@google.com> | 2021-11-04 22:01:16 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2021-11-04 22:01:16 +0000 |
commit | 6a04ee8cefa18c73598714828dbb2a66e7606fc4 (patch) | |
tree | 0453ccd64d728ef765c06eee1651671d573bddd2 /pkg/sentry/kernel | |
parent | c884dcb8316a261f2af70fd3fbb966b3eab1bfbe (diff) | |
parent | fe8e48fc6d5094fe34783b1040b2ae4ba05349b5 (diff) |
Merge release-20211026.0-34-gfe8e48fc6 (automated)
Diffstat (limited to 'pkg/sentry/kernel')
-rw-r--r-- | pkg/sentry/kernel/task_exit.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/task_exit.go b/pkg/sentry/kernel/task_exit.go index b3931445b..fa523c4db 100644 --- a/pkg/sentry/kernel/task_exit.go +++ b/pkg/sentry/kernel/task_exit.go @@ -32,7 +32,6 @@ import ( "gvisor.dev/gvisor/pkg/abi/linux" "gvisor.dev/gvisor/pkg/errors/linuxerr" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" - "gvisor.dev/gvisor/pkg/syserr" "gvisor.dev/gvisor/pkg/waiter" ) @@ -866,7 +865,7 @@ func (t *Task) Wait(opts *WaitOptions) (*WaitResult, error) { return wr, err } if err := t.Block(ch); err != nil { - return wr, syserr.ConvertIntr(err, opts.BlockInterruptErr) + return wr, linuxerr.ConvertIntr(err, opts.BlockInterruptErr) } } } |