Merge release-20201027.0-62-g580bbb749 (automated)

2 files changed, 12 insertions, 9 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
diff --git a/pkg/sentry/vfs/vfs_state_autogen.go b/pkg/sentry/vfs/vfs_state_autogen.go
index 67b161d93..2cae3bc44 100644
--- a/pkg/sentry/vfs/vfs_state_autogen.go
+++ b/pkg/sentry/vfs/vfs_state_autogen.go
@@ -879,6 +879,7 @@ func (i *Inotify) StateFields() []string {
 		"DentryMetadataFileDescriptionImpl",
 		"NoLockFD",
 		"id",
+		"queue",
 		"events",
 		"scratch",
 		"nextWatchMinusOne",
@@ -895,10 +896,11 @@ func (i *Inotify) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(2, &i.DentryMetadataFileDescriptionImpl)
 	stateSinkObject.Save(3, &i.NoLockFD)
 	stateSinkObject.Save(4, &i.id)
-	stateSinkObject.Save(5, &i.events)
-	stateSinkObject.Save(6, &i.scratch)
-	stateSinkObject.Save(7, &i.nextWatchMinusOne)
-	stateSinkObject.Save(8, &i.watches)
+	stateSinkObject.Save(5, &i.queue)
+	stateSinkObject.Save(6, &i.events)
+	stateSinkObject.Save(7, &i.scratch)
+	stateSinkObject.Save(8, &i.nextWatchMinusOne)
+	stateSinkObject.Save(9, &i.watches)
 }
 
 func (i *Inotify) afterLoad() {}
@@ -909,10 +911,11 @@ func (i *Inotify) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(2, &i.DentryMetadataFileDescriptionImpl)
 	stateSourceObject.Load(3, &i.NoLockFD)
 	stateSourceObject.Load(4, &i.id)
-	stateSourceObject.Load(5, &i.events)
-	stateSourceObject.Load(6, &i.scratch)
-	stateSourceObject.Load(7, &i.nextWatchMinusOne)
-	stateSourceObject.Load(8, &i.watches)
+	stateSourceObject.Load(5, &i.queue)
+	stateSourceObject.Load(6, &i.events)
+	stateSourceObject.Load(7, &i.scratch)
+	stateSourceObject.Load(8, &i.nextWatchMinusOne)
+	stateSourceObject.Load(9, &i.watches)
 }
 
 func (w *Watches) StateTypeName() string {