diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2016-07-22 18:15:38 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2016-07-22 18:15:38 +0000 |
| commit | 22b955cca564a9a3a5b8c9d9dd1e295b7943c128 (patch) | |
| tree | abdbd898676e1f853fca2d7e031d105d7ebcf676 /libgo/go/net/file_plan9.go | |
| parent | 9d04a3af4c6491536badf6bde9707c907e4d196b (diff) | |
libgo: update to go1.7rc3
Reviewed-on: https://go-review.googlesource.com/25150
From-SVN: r238662
Diffstat (limited to 'libgo/go/net/file_plan9.go')
| -rw-r--r-- | libgo/go/net/file_plan9.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libgo/go/net/file_plan9.go b/libgo/go/net/file_plan9.go index 892775a024f..2939c09a430 100644 --- a/libgo/go/net/file_plan9.go +++ b/libgo/go/net/file_plan9.go @@ -50,9 +50,7 @@ func newFileFD(f *os.File) (net *netFD, err error) { name := comp[2] switch file := comp[n-1]; file { case "ctl", "clone": - syscall.ForkLock.RLock() fd, err := syscall.Dup(int(f.Fd()), -1) - syscall.ForkLock.RUnlock() if err != nil { return nil, os.NewSyscallError("dup", err) } @@ -60,7 +58,7 @@ func newFileFD(f *os.File) (net *netFD, err error) { dir := netdir + "/" + comp[n-2] ctl = os.NewFile(uintptr(fd), dir+"/"+file) - ctl.Seek(0, 0) + ctl.Seek(0, io.SeekStart) var buf [16]byte n, err := ctl.Read(buf[:]) if err != nil { |