Merge release-20210927.0-60-g8682ce689 (automated)

2 files changed, 4 insertions, 4 deletions

diff --git a/pkg/sentry/fs/lock/lock.go b/pkg/sentry/fs/lock/lock.go
index 7d7a207cc..e39d340fe 100644
--- a/pkg/sentry/fs/lock/lock.go
+++ b/pkg/sentry/fs/lock/lock.go
@@ -132,7 +132,7 @@ type Locks struct {
 	locks LockSet
 
 	// blockedQueue is the queue of waiters that are waiting on a lock.
-	blockedQueue waiter.Queue `state:"zerovalue"`
+	blockedQueue waiter.Queue
 }
 
 // Blocker is the interface used for blocking locks. Passing a nil Blocker
diff --git a/pkg/sentry/fs/lock/lock_state_autogen.go b/pkg/sentry/fs/lock/lock_state_autogen.go
index 4a9d0a1d8..8ddb3795c 100644
--- a/pkg/sentry/fs/lock/lock_state_autogen.go
+++ b/pkg/sentry/fs/lock/lock_state_autogen.go
@@ -69,6 +69,7 @@ func (l *Locks) StateTypeName() string {
 func (l *Locks) StateFields() []string {
 	return []string{
 		"locks",
+		"blockedQueue",
 	}
 }
 
@@ -77,10 +78,8 @@ func (l *Locks) beforeSave() {}
 // +checklocksignore
 func (l *Locks) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
-	if !state.IsZeroValue(&l.blockedQueue) {
-		state.Failf("blockedQueue is %#v, expected zero", &l.blockedQueue)
-	}
 	stateSinkObject.Save(0, &l.locks)
+	stateSinkObject.Save(1, &l.blockedQueue)
 }
 
 func (l *Locks) afterLoad() {}
@@ -88,6 +87,7 @@ func (l *Locks) afterLoad() {}
 // +checklocksignore
 func (l *Locks) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.locks)
+	stateSourceObject.Load(1, &l.blockedQueue)
 }
 
 func (r *LockRange) StateTypeName() string {