diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-10-01 19:25:23 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-10-01 19:25:23 +0000 |
| commit | 63542c54527c47597e7b92fa4289f80ef1bfb9b5 (patch) | |
| tree | 856176e13ec8cc867f0a245f25ec0d6d9f01dd52 /pkg/sentry/fs | |
| parent | 883e7cdc91384dbe21c8ea32eb77a9463d84787a (diff) | |
| parent | dd69b49ed1103bab82a6b2ac95221b89b46f3376 (diff) | |
Merge release-20190806.1-221-gdd69b49 (automated)
Diffstat (limited to 'pkg/sentry/fs')
| -rw-r--r-- | pkg/sentry/fs/timerfd/timerfd.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/sentry/fs/timerfd/timerfd.go b/pkg/sentry/fs/timerfd/timerfd.go index 59403d9db..f8bf663bb 100644 --- a/pkg/sentry/fs/timerfd/timerfd.go +++ b/pkg/sentry/fs/timerfd/timerfd.go @@ -141,9 +141,10 @@ func (t *TimerOperations) Write(context.Context, *fs.File, usermem.IOSequence, i } // Notify implements ktime.TimerListener.Notify. -func (t *TimerOperations) Notify(exp uint64) { +func (t *TimerOperations) Notify(exp uint64, setting ktime.Setting) (ktime.Setting, bool) { atomic.AddUint64(&t.val, exp) t.events.Notify(waiter.EventIn) + return ktime.Setting{}, false } // Destroy implements ktime.TimerListener.Destroy. |