diff options
author | Zach Koopmans <zkoopmans@google.com> | 2021-11-04 14:52:36 -0700 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2021-11-04 14:55:52 -0700 |
commit | fe8e48fc6d5094fe34783b1040b2ae4ba05349b5 (patch) | |
tree | 3d532abd71a834b5bfc3af57b34db1609c8d028c /pkg/sentry/kernel | |
parent | 23a115dae84e7e63c8785c49dfff3e551a0bf97e (diff) |
[syserr] Move ConvertIntr function to linuxerr package
Move ConverIntr out of syserr package and delete an unused function.
PiperOrigin-RevId: 407676258
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) } } } |