summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/kernel/epoll/epoll_state.go
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-06-24 20:59:20 +0000
committergVisor bot <gvisor-bot@google.com>2020-06-24 20:59:20 +0000
commit0671d5e343392ec8d40f714c0becc50ad46e0afa (patch)
tree69dc5bf3ecd3c3378196c0cbfcfdaea9d0126cd1 /pkg/sentry/kernel/epoll/epoll_state.go
parent0df6689b497c35af683af8f7b2380f8803640adb (diff)
parent10930b0f8c1ff2ac83c7a30cc1f78112a35e3183 (diff)
Merge release-20200608.0-121-g10930b0f8 (automated)
Diffstat (limited to 'pkg/sentry/kernel/epoll/epoll_state.go')
-rw-r--r--pkg/sentry/kernel/epoll/epoll_state.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/epoll/epoll_state.go b/pkg/sentry/kernel/epoll/epoll_state.go
index 8e9f200d0..02f9aabfa 100644
--- a/pkg/sentry/kernel/epoll/epoll_state.go
+++ b/pkg/sentry/kernel/epoll/epoll_state.go
@@ -21,8 +21,7 @@ import (
// afterLoad is invoked by stateify.
func (p *pollEntry) afterLoad() {
- p.waiter = waiter.Entry{Callback: &readyCallback{}}
- p.waiter.Context = p
+ p.waiter.Callback = &readyCallback{context: p}
p.file = refs.NewWeakRef(p.id.File, p)
p.id.File.EventRegister(&p.waiter, p.mask)
}