summaryrefslogtreecommitdiffhomepage
path: root/pkg/flipcall/futex_linux.go
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2019-11-01 18:47:47 +0000
committergVisor bot <gvisor-bot@google.com>2019-11-01 18:47:47 +0000
commite7f30113e2a244a8acc080097909406688c50236 (patch)
treed624b1cb08d7e4ff4d3301310c75f0063e035828 /pkg/flipcall/futex_linux.go
parent3e21d5a619c28d10f8850e3f96ef27958283bdc9 (diff)
parent5694bd080e0e95ba18cbf77038f450fe33b9f8df (diff)
Merge release-20190806.1-360-g5694bd0 (automated)
Diffstat (limited to 'pkg/flipcall/futex_linux.go')
-rwxr-xr-xpkg/flipcall/futex_linux.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/flipcall/futex_linux.go b/pkg/flipcall/futex_linux.go
index b127a2bbb..168c1ccff 100755
--- a/pkg/flipcall/futex_linux.go
+++ b/pkg/flipcall/futex_linux.go
@@ -61,7 +61,7 @@ func (ep *Endpoint) futexSwitchToPeer() error {
if !atomic.CompareAndSwapUint32(ep.connState(), ep.activeState, ep.inactiveState) {
switch cs := atomic.LoadUint32(ep.connState()); cs {
case csShutdown:
- return shutdownError{}
+ return ShutdownError{}
default:
return fmt.Errorf("unexpected connection state before FUTEX_WAKE: %v", cs)
}
@@ -81,14 +81,14 @@ func (ep *Endpoint) futexSwitchFromPeer() error {
return nil
case ep.inactiveState:
if ep.isShutdownLocally() {
- return shutdownError{}
+ return ShutdownError{}
}
if err := ep.futexWaitConnState(ep.inactiveState); err != nil {
return fmt.Errorf("failed to FUTEX_WAIT for peer Endpoint: %v", err)
}
continue
case csShutdown:
- return shutdownError{}
+ return ShutdownError{}
default:
return fmt.Errorf("unexpected connection state before FUTEX_WAIT: %v", cs)
}