Merge release-20210726.0-57-g3416a3db7 (automated)

5 files changed, 14 insertions, 7 deletions

diff --git a/pkg/sentry/fs/fdpipe/fdpipe_state_autogen.go b/pkg/sentry/fs/fdpipe/fdpipe_state_autogen.go
index 92dcd2391..68406ce66 100644
--- a/pkg/sentry/fs/fdpipe/fdpipe_state_autogen.go
+++ b/pkg/sentry/fs/fdpipe/fdpipe_state_autogen.go
@@ -22,7 +22,8 @@ func (p *pipeOperations) StateFields() []string {
 // +checklocksignore
 func (p *pipeOperations) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
-	var flagsValue fs.FileFlags = p.saveFlags()
+	var flagsValue fs.FileFlags
+	flagsValue = p.saveFlags()
 	stateSinkObject.SaveValue(0, flagsValue)
 	stateSinkObject.Save(1, &p.opener)
 	stateSinkObject.Save(2, &p.readAheadBuffer)
diff --git a/pkg/sentry/fs/fs_state_autogen.go b/pkg/sentry/fs/fs_state_autogen.go
index a4a67fca2..62ab34d6f 100644
--- a/pkg/sentry/fs/fs_state_autogen.go
+++ b/pkg/sentry/fs/fs_state_autogen.go
@@ -328,7 +328,8 @@ func (d *Dirent) StateFields() []string {
 // +checklocksignore
 func (d *Dirent) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
-	var childrenValue map[string]*Dirent = d.saveChildren()
+	var childrenValue map[string]*Dirent
+	childrenValue = d.saveChildren()
 	stateSinkObject.SaveValue(7, childrenValue)
 	stateSinkObject.Save(0, &d.AtomicRefCount)
 	stateSinkObject.Save(1, &d.userVisible)
diff --git a/pkg/sentry/fs/fsutil/fsutil_impl_state_autogen.go b/pkg/sentry/fs/fsutil/fsutil_impl_state_autogen.go
index b7f95bde7..9671c2349 100644
--- a/pkg/sentry/fs/fsutil/fsutil_impl_state_autogen.go
+++ b/pkg/sentry/fs/fsutil/fsutil_impl_state_autogen.go
@@ -21,7 +21,8 @@ func (s *DirtySet) beforeSave() {}
 // +checklocksignore
 func (s *DirtySet) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
-	var rootValue *DirtySegmentDataSlices = s.saveRoot()
+	var rootValue *DirtySegmentDataSlices
+	rootValue = s.saveRoot()
 	stateSinkObject.SaveValue(0, rootValue)
 }
 
@@ -124,7 +125,8 @@ func (s *FileRangeSet) beforeSave() {}
 // +checklocksignore
 func (s *FileRangeSet) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
-	var rootValue *FileRangeSegmentDataSlices = s.saveRoot()
+	var rootValue *FileRangeSegmentDataSlices
+	rootValue = s.saveRoot()
 	stateSinkObject.SaveValue(0, rootValue)
 }
 
@@ -227,7 +229,8 @@ func (s *FrameRefSet) beforeSave() {}
 // +checklocksignore
 func (s *FrameRefSet) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
-	var rootValue *FrameRefSegmentDataSlices = s.saveRoot()
+	var rootValue *FrameRefSegmentDataSlices
+	rootValue = s.saveRoot()
 	stateSinkObject.SaveValue(0, rootValue)
 }
 
diff --git a/pkg/sentry/fs/gofer/gofer_state_autogen.go b/pkg/sentry/fs/gofer/gofer_state_autogen.go
index d22ecc3c2..e36638c37 100644
--- a/pkg/sentry/fs/gofer/gofer_state_autogen.go
+++ b/pkg/sentry/fs/gofer/gofer_state_autogen.go
@@ -130,7 +130,8 @@ func (i *inodeFileState) StateFields() []string {
 // +checklocksignore
 func (i *inodeFileState) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
-	var loadingValue struct{} = i.saveLoading()
+	var loadingValue struct{}
+	loadingValue = i.saveLoading()
 	stateSinkObject.SaveValue(2, loadingValue)
 	stateSinkObject.Save(0, &i.s)
 	stateSinkObject.Save(1, &i.sattr)
diff --git a/pkg/sentry/fs/lock/lock_state_autogen.go b/pkg/sentry/fs/lock/lock_state_autogen.go
index a0ad18763..4a9d0a1d8 100644
--- a/pkg/sentry/fs/lock/lock_state_autogen.go
+++ b/pkg/sentry/fs/lock/lock_state_autogen.go
@@ -133,7 +133,8 @@ func (s *LockSet) beforeSave() {}
 // +checklocksignore
 func (s *LockSet) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
-	var rootValue *LockSegmentDataSlices = s.saveRoot()
+	var rootValue *LockSegmentDataSlices
+	rootValue = s.saveRoot()
 	stateSinkObject.SaveValue(0, rootValue)
 }