From fe8e48fc6d5094fe34783b1040b2ae4ba05349b5 Mon Sep 17 00:00:00 2001 From: Zach Koopmans Date: Thu, 4 Nov 2021 14:52:36 -0700 Subject: [syserr] Move ConvertIntr function to linuxerr package Move ConverIntr out of syserr package and delete an unused function. PiperOrigin-RevId: 407676258 --- pkg/sentry/kernel/task_exit.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pkg/sentry/kernel') 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) } } } -- cgit v1.2.3