Merge release-20210301.0-5-ga9441aea2 (automated)

1 files changed, 6 insertions, 7 deletions

diff --git a/pkg/p9/file.go b/pkg/p9/file.go
index c2e3a3f98..c59c6a65b 100644
--- a/pkg/p9/file.go
+++ b/pkg/p9/file.go
@@ -15,8 +15,7 @@
 package p9
 
 import (
-	"syscall"
-
+	"golang.org/x/sys/unix"
 	"gvisor.dev/gvisor/pkg/fd"
 )
 
@@ -67,7 +66,7 @@ type File interface {
 	// WalkGetAttr walks to the next file and returns its maximal set of
 	// attributes.
 	//
-	// Server-side p9.Files may return syscall.ENOSYS to indicate that Walk
+	// Server-side p9.Files may return unix.ENOSYS to indicate that Walk
 	// and GetAttr should be used separately to satisfy this request.
 	//
 	// On the server, WalkGetAttr has a read concurrency guarantee.
@@ -160,7 +159,7 @@ type File interface {
 
 	// Read reads from this file. Open must be called first.
 	//
-	// This may return io.EOF in addition to syscall.Errno values.
+	// This may return io.EOF in addition to unix.Errno values.
 	//
 	// On the server, ReadAt has a read concurrency guarantee. See Open for
 	// additional requirements regarding lazy path resolution.
@@ -168,7 +167,7 @@ type File interface {
 
 	// Write writes to this file. Open must be called first.
 	//
-	// This may return io.EOF in addition to syscall.Errno values.
+	// This may return io.EOF in addition to unix.Errno values.
 	//
 	// On the server, WriteAt has a read concurrency guarantee. See Open
 	// for additional requirements regarding lazy path resolution.
@@ -239,7 +238,7 @@ type File interface {
 
 	// Readdir reads directory entries.
 	//
-	// This may return io.EOF in addition to syscall.Errno values.
+	// This may return io.EOF in addition to unix.Errno values.
 	//
 	// On the server, Readdir has a read concurrency guarantee.
 	Readdir(offset uint64, count uint32) ([]Dirent, error)
@@ -292,7 +291,7 @@ type DefaultWalkGetAttr struct{}
 
 // WalkGetAttr implements File.WalkGetAttr.
 func (DefaultWalkGetAttr) WalkGetAttr([]string) ([]QID, File, AttrMask, Attr, error) {
-	return nil, nil, AttrMask{}, Attr{}, syscall.ENOSYS
+	return nil, nil, AttrMask{}, Attr{}, unix.ENOSYS
 }
 
 // DisallowClientCalls panics if a client-only function is called.