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/syscalls/linux/sys_file.go | |
| 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/syscalls/linux/sys_file.go')
| -rw-r--r-- | pkg/sentry/syscalls/linux/sys_file.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/sentry/syscalls/linux/sys_file.go b/pkg/sentry/syscalls/linux/sys_file.go index e79b92fb6..6b283dbaf 100644 --- a/pkg/sentry/syscalls/linux/sys_file.go +++ b/pkg/sentry/syscalls/linux/sys_file.go @@ -30,7 +30,6 @@ import ( "gvisor.dev/gvisor/pkg/sentry/kernel/fasync" ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" "gvisor.dev/gvisor/pkg/sentry/limits" - "gvisor.dev/gvisor/pkg/syserr" ) // fileOpAt performs an operation on the second last component in the path. @@ -177,7 +176,7 @@ func openAt(t *kernel.Task, dirFD int32, addr hostarch.Addr, flags uint) (fd uin file, err := d.Inode.GetFile(t, d, fileFlags) if err != nil { - return syserr.ConvertIntr(err, linuxerr.ERESTARTSYS) + return linuxerr.ConvertIntr(err, linuxerr.ERESTARTSYS) } defer file.DecRef(t) @@ -416,7 +415,7 @@ func createAt(t *kernel.Task, dirFD int32, addr hostarch.Addr, flags uint, mode // Create a new fs.File. newFile, err = found.Inode.GetFile(t, found, fileFlags) if err != nil { - return syserr.ConvertIntr(err, linuxerr.ERESTARTSYS) + return linuxerr.ConvertIntr(err, linuxerr.ERESTARTSYS) } defer newFile.DecRef(t) case linuxerr.Equals(linuxerr.ENOENT, err): |