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/fdpipe | |
| parent | a77fbc58b6782b28d2462b62f49f56c6d0f17cc3 (diff) | |
| parent | 8682ce689e928ec32ec810a7eb038fb582c66093 (diff) | |
Merge release-20210927.0-60-g8682ce689 (automated)
Diffstat (limited to 'pkg/sentry/fs/fdpipe')
| -rw-r--r-- | pkg/sentry/fs/fdpipe/fdpipe_state_autogen.go | 15 | ||||
| -rw-r--r-- | pkg/sentry/fs/fdpipe/pipe.go | 3 |
2 files changed, 11 insertions, 7 deletions
diff --git a/pkg/sentry/fs/fdpipe/fdpipe_state_autogen.go b/pkg/sentry/fs/fdpipe/fdpipe_state_autogen.go index 68406ce66..247aba66b 100644 --- a/pkg/sentry/fs/fdpipe/fdpipe_state_autogen.go +++ b/pkg/sentry/fs/fdpipe/fdpipe_state_autogen.go @@ -13,6 +13,7 @@ func (p *pipeOperations) StateTypeName() string { func (p *pipeOperations) StateFields() []string { return []string{ + "Queue", "flags", "opener", "readAheadBuffer", @@ -24,16 +25,18 @@ func (p *pipeOperations) StateSave(stateSinkObject state.Sink) { p.beforeSave() var flagsValue fs.FileFlags flagsValue = p.saveFlags() - stateSinkObject.SaveValue(0, flagsValue) - stateSinkObject.Save(1, &p.opener) - stateSinkObject.Save(2, &p.readAheadBuffer) + stateSinkObject.SaveValue(1, flagsValue) + stateSinkObject.Save(0, &p.Queue) + stateSinkObject.Save(2, &p.opener) + stateSinkObject.Save(3, &p.readAheadBuffer) } // +checklocksignore func (p *pipeOperations) StateLoad(stateSourceObject state.Source) { - stateSourceObject.LoadWait(1, &p.opener) - stateSourceObject.Load(2, &p.readAheadBuffer) - stateSourceObject.LoadValue(0, new(fs.FileFlags), func(y interface{}) { p.loadFlags(y.(fs.FileFlags)) }) + stateSourceObject.Load(0, &p.Queue) + stateSourceObject.LoadWait(2, &p.opener) + stateSourceObject.Load(3, &p.readAheadBuffer) + stateSourceObject.LoadValue(1, new(fs.FileFlags), func(y interface{}) { p.loadFlags(y.(fs.FileFlags)) }) stateSourceObject.AfterLoad(p.afterLoad) } diff --git a/pkg/sentry/fs/fdpipe/pipe.go b/pkg/sentry/fs/fdpipe/pipe.go index 4370cce33..d2eb03bb7 100644 --- a/pkg/sentry/fs/fdpipe/pipe.go +++ b/pkg/sentry/fs/fdpipe/pipe.go @@ -45,7 +45,8 @@ type pipeOperations struct { fsutil.FileNoIoctl `state:"nosave"` fsutil.FileNoSplice `state:"nosave"` fsutil.FileUseInodeUnstableAttr `state:"nosave"` - waiter.Queue `state:"nosave"` + + waiter.Queue // flags are the flags used to open the pipe. flags fs.FileFlags `state:".(fs.FileFlags)"` |