diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-10-12 17:29:59 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-10-12 17:29:59 +0000 |
| commit | b8c205542c13df2b97629e6235eb8656c55494dd (patch) | |
| tree | 827ec99fd04d0739cfd7c2958586b1e2f4345457 /pkg/sentry/fs/host | |
| parent | a77fbc58b6782b28d2462b62f49f56c6d0f17cc3 (diff) | |
| parent | 8682ce689e928ec32ec810a7eb038fb582c66093 (diff) | |
Merge release-20210927.0-60-g8682ce689 (automated)
Diffstat (limited to 'pkg/sentry/fs/host')
| -rw-r--r-- | pkg/sentry/fs/host/host_state_autogen.go | 14 | ||||
| -rw-r--r-- | pkg/sentry/fs/host/inode.go | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkg/sentry/fs/host/host_state_autogen.go b/pkg/sentry/fs/host/host_state_autogen.go index b06247919..50869fd79 100644 --- a/pkg/sentry/fs/host/host_state_autogen.go +++ b/pkg/sentry/fs/host/host_state_autogen.go @@ -115,6 +115,7 @@ func (i *inodeFileState) StateTypeName() string { func (i *inodeFileState) StateFields() []string { return []string{ "descriptor", + "queue", "sattr", "savedUAttr", } @@ -125,19 +126,18 @@ func (i *inodeFileState) beforeSave() {} // +checklocksignore func (i *inodeFileState) StateSave(stateSinkObject state.Sink) { i.beforeSave() - if !state.IsZeroValue(&i.queue) { - state.Failf("queue is %#v, expected zero", &i.queue) - } stateSinkObject.Save(0, &i.descriptor) - stateSinkObject.Save(1, &i.sattr) - stateSinkObject.Save(2, &i.savedUAttr) + stateSinkObject.Save(1, &i.queue) + stateSinkObject.Save(2, &i.sattr) + stateSinkObject.Save(3, &i.savedUAttr) } // +checklocksignore func (i *inodeFileState) StateLoad(stateSourceObject state.Source) { stateSourceObject.LoadWait(0, &i.descriptor) - stateSourceObject.LoadWait(1, &i.sattr) - stateSourceObject.Load(2, &i.savedUAttr) + stateSourceObject.Load(1, &i.queue) + stateSourceObject.LoadWait(2, &i.sattr) + stateSourceObject.Load(3, &i.savedUAttr) stateSourceObject.AfterLoad(i.afterLoad) } diff --git a/pkg/sentry/fs/host/inode.go b/pkg/sentry/fs/host/inode.go index 92d58e3e9..99c37291e 100644 --- a/pkg/sentry/fs/host/inode.go +++ b/pkg/sentry/fs/host/inode.go @@ -70,7 +70,7 @@ type inodeFileState struct { descriptor *descriptor `state:"wait"` // Event queue for blocking operations. - queue waiter.Queue `state:"zerovalue"` + queue waiter.Queue // sattr is used to restore the inodeOperations. sattr fs.StableAttr `state:"wait"` |