Merge release-20210315.0-15-gacb4c6288 (automated)

1 files changed, 14 insertions, 0 deletions

diff --git a/pkg/sentry/kernel/pipe/pipe_state_autogen.go b/pkg/sentry/kernel/pipe/pipe_state_autogen.go
index 9cee1f13a..57451e951 100644
--- a/pkg/sentry/kernel/pipe/pipe_state_autogen.go
+++ b/pkg/sentry/kernel/pipe/pipe_state_autogen.go
@@ -19,6 +19,7 @@ func (i *inodeOperations) StateFields() []string {
 
 func (i *inodeOperations) beforeSave() {}
 
+// +checklocksignore
 func (i *inodeOperations) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.InodeSimpleAttributes)
@@ -27,6 +28,7 @@ func (i *inodeOperations) StateSave(stateSinkObject state.Sink) {
 
 func (i *inodeOperations) afterLoad() {}
 
+// +checklocksignore
 func (i *inodeOperations) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.InodeSimpleAttributes)
 	stateSourceObject.Load(1, &i.p)
@@ -51,6 +53,7 @@ func (p *Pipe) StateFields() []string {
 
 func (p *Pipe) beforeSave() {}
 
+// +checklocksignore
 func (p *Pipe) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
 	stateSinkObject.Save(0, &p.isNamed)
@@ -63,6 +66,7 @@ func (p *Pipe) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(7, &p.hadWriter)
 }
 
+// +checklocksignore
 func (p *Pipe) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &p.isNamed)
 	stateSourceObject.Load(1, &p.readers)
@@ -87,6 +91,7 @@ func (r *Reader) StateFields() []string {
 
 func (r *Reader) beforeSave() {}
 
+// +checklocksignore
 func (r *Reader) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.ReaderWriter)
@@ -94,6 +99,7 @@ func (r *Reader) StateSave(stateSinkObject state.Sink) {
 
 func (r *Reader) afterLoad() {}
 
+// +checklocksignore
 func (r *Reader) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.ReaderWriter)
 }
@@ -110,6 +116,7 @@ func (rw *ReaderWriter) StateFields() []string {
 
 func (rw *ReaderWriter) beforeSave() {}
 
+// +checklocksignore
 func (rw *ReaderWriter) StateSave(stateSinkObject state.Sink) {
 	rw.beforeSave()
 	stateSinkObject.Save(0, &rw.Pipe)
@@ -117,6 +124,7 @@ func (rw *ReaderWriter) StateSave(stateSinkObject state.Sink) {
 
 func (rw *ReaderWriter) afterLoad() {}
 
+// +checklocksignore
 func (rw *ReaderWriter) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &rw.Pipe)
 }
@@ -133,6 +141,7 @@ func (vp *VFSPipe) StateFields() []string {
 
 func (vp *VFSPipe) beforeSave() {}
 
+// +checklocksignore
 func (vp *VFSPipe) StateSave(stateSinkObject state.Sink) {
 	vp.beforeSave()
 	stateSinkObject.Save(0, &vp.pipe)
@@ -140,6 +149,7 @@ func (vp *VFSPipe) StateSave(stateSinkObject state.Sink) {
 
 func (vp *VFSPipe) afterLoad() {}
 
+// +checklocksignore
 func (vp *VFSPipe) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &vp.pipe)
 }
@@ -160,6 +170,7 @@ func (fd *VFSPipeFD) StateFields() []string {
 
 func (fd *VFSPipeFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *VFSPipeFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.vfsfd)
@@ -171,6 +182,7 @@ func (fd *VFSPipeFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *VFSPipeFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *VFSPipeFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.vfsfd)
 	stateSourceObject.Load(1, &fd.FileDescriptionDefaultImpl)
@@ -191,6 +203,7 @@ func (w *Writer) StateFields() []string {
 
 func (w *Writer) beforeSave() {}
 
+// +checklocksignore
 func (w *Writer) StateSave(stateSinkObject state.Sink) {
 	w.beforeSave()
 	stateSinkObject.Save(0, &w.ReaderWriter)
@@ -198,6 +211,7 @@ func (w *Writer) StateSave(stateSinkObject state.Sink) {
 
 func (w *Writer) afterLoad() {}
 
+// +checklocksignore
 func (w *Writer) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &w.ReaderWriter)
 }