diff options
| author | Dean Deng <deandeng@google.com> | 2020-11-03 14:54:54 -0800 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-11-03 14:56:35 -0800 |
| commit | 580bbb749747e8c8bbf4dfe60c15676c85065a6a (patch) | |
| tree | 35d9cd3e7ec6b93686fb049edeb981f43675ec2c /pkg/sentry/vfs | |
| parent | 723464ec5522b479bceaa253994d4b865300bd95 (diff) | |
[vfs2] Do not drop inotify waiters across S/R.
The waits-for relationship between an epoll instance and an inotify fd should
be restored.
This fixes flaky inotify vfs2 tests.
PiperOrigin-RevId: 340531367
Diffstat (limited to 'pkg/sentry/vfs')
| -rw-r--r-- | pkg/sentry/vfs/inotify.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/vfs/inotify.go b/pkg/sentry/vfs/inotify.go index 3f0b8f45b..107171b61 100644 --- a/pkg/sentry/vfs/inotify.go +++ b/pkg/sentry/vfs/inotify.go @@ -65,7 +65,7 @@ type Inotify struct { // queue is used to notify interested parties when the inotify instance // becomes readable or writable. - queue waiter.Queue `state:"nosave"` + queue waiter.Queue // evMu *only* protects the events list. We need a separate lock while // queuing events: using mu may violate lock ordering, since at that point |