mirror of
https://github.com/netbirdio/gvisor.git
synced 2026-05-22 17:12:49 -07:00
[syserror] Remove pkg syserror.
Removes package syserror and moves still relevant code to either linuxerr or to syserr (to be later removed). Internal errors are converted from random types to *errors.Error types used in linuxerr. Internal errors are in linuxerr/internal.go. PiperOrigin-RevId: 390724202
This commit is contained in:
committed by
gVisor bot
parent
868ed0e807
commit
ce58d71fd5
@@ -17,12 +17,12 @@ package devpts
|
||||
import (
|
||||
"gvisor.dev/gvisor/pkg/abi/linux"
|
||||
"gvisor.dev/gvisor/pkg/context"
|
||||
"gvisor.dev/gvisor/pkg/errors/linuxerr"
|
||||
"gvisor.dev/gvisor/pkg/marshal/primitive"
|
||||
"gvisor.dev/gvisor/pkg/safemem"
|
||||
"gvisor.dev/gvisor/pkg/sentry/arch"
|
||||
"gvisor.dev/gvisor/pkg/sentry/kernel"
|
||||
"gvisor.dev/gvisor/pkg/sync"
|
||||
"gvisor.dev/gvisor/pkg/syserror"
|
||||
"gvisor.dev/gvisor/pkg/usermem"
|
||||
"gvisor.dev/gvisor/pkg/waiter"
|
||||
)
|
||||
@@ -110,7 +110,7 @@ func (q *queue) read(ctx context.Context, dst usermem.IOSequence, l *lineDiscipl
|
||||
defer q.mu.Unlock()
|
||||
|
||||
if !q.readable {
|
||||
return 0, false, false, syserror.ErrWouldBlock
|
||||
return 0, false, false, linuxerr.ErrWouldBlock
|
||||
}
|
||||
|
||||
if dst.NumBytes() > canonMaxBytes {
|
||||
@@ -156,7 +156,7 @@ func (q *queue) write(ctx context.Context, src usermem.IOSequence, l *lineDiscip
|
||||
room := waitBufMaxBytes - q.waitBufLen
|
||||
// If out of room, return EAGAIN.
|
||||
if room == 0 && copyLen > 0 {
|
||||
return 0, syserror.ErrWouldBlock
|
||||
return 0, linuxerr.ErrWouldBlock
|
||||
}
|
||||
// Cap the size of the wait buffer.
|
||||
if copyLen > room {
|
||||
|
||||
Reference in New Issue
Block a user