Merge release-20210315.0-15-gacb4c6288 (automated)

1 files changed, 16 insertions, 0 deletions

diff --git a/pkg/sentry/fsimpl/overlay/overlay_state_autogen.go b/pkg/sentry/fsimpl/overlay/overlay_state_autogen.go
index 7c60e23f5..923a2e71a 100644
--- a/pkg/sentry/fsimpl/overlay/overlay_state_autogen.go
+++ b/pkg/sentry/fsimpl/overlay/overlay_state_autogen.go
@@ -22,6 +22,7 @@ func (fd *directoryFD) StateFields() []string {
 
 func (fd *directoryFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *directoryFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.fileDescription)
@@ -33,6 +34,7 @@ func (fd *directoryFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *directoryFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *directoryFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.fileDescription)
 	stateSourceObject.Load(1, &fd.DirectoryFileDescriptionDefaultImpl)
@@ -51,12 +53,14 @@ func (fstype *FilesystemType) StateFields() []string {
 
 func (fstype *FilesystemType) beforeSave() {}
 
+// +checklocksignore
 func (fstype *FilesystemType) StateSave(stateSinkObject state.Sink) {
 	fstype.beforeSave()
 }
 
 func (fstype *FilesystemType) afterLoad() {}
 
+// +checklocksignore
 func (fstype *FilesystemType) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -73,6 +77,7 @@ func (f *FilesystemOptions) StateFields() []string {
 
 func (f *FilesystemOptions) beforeSave() {}
 
+// +checklocksignore
 func (f *FilesystemOptions) StateSave(stateSinkObject state.Sink) {
 	f.beforeSave()
 	stateSinkObject.Save(0, &f.UpperRoot)
@@ -81,6 +86,7 @@ func (f *FilesystemOptions) StateSave(stateSinkObject state.Sink) {
 
 func (f *FilesystemOptions) afterLoad() {}
 
+// +checklocksignore
 func (f *FilesystemOptions) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &f.UpperRoot)
 	stateSourceObject.Load(1, &f.LowerRoots)
@@ -101,6 +107,7 @@ func (fs *filesystem) StateFields() []string {
 
 func (fs *filesystem) beforeSave() {}
 
+// +checklocksignore
 func (fs *filesystem) StateSave(stateSinkObject state.Sink) {
 	fs.beforeSave()
 	stateSinkObject.Save(0, &fs.vfsfs)
@@ -111,6 +118,7 @@ func (fs *filesystem) StateSave(stateSinkObject state.Sink) {
 
 func (fs *filesystem) afterLoad() {}
 
+// +checklocksignore
 func (fs *filesystem) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fs.vfsfs)
 	stateSourceObject.Load(1, &fs.opts)
@@ -131,6 +139,7 @@ func (l *layerDevNumber) StateFields() []string {
 
 func (l *layerDevNumber) beforeSave() {}
 
+// +checklocksignore
 func (l *layerDevNumber) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.major)
@@ -139,6 +148,7 @@ func (l *layerDevNumber) StateSave(stateSinkObject state.Sink) {
 
 func (l *layerDevNumber) afterLoad() {}
 
+// +checklocksignore
 func (l *layerDevNumber) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.major)
 	stateSourceObject.Load(1, &l.minor)
@@ -177,6 +187,7 @@ func (d *dentry) StateFields() []string {
 
 func (d *dentry) beforeSave() {}
 
+// +checklocksignore
 func (d *dentry) StateSave(stateSinkObject state.Sink) {
 	d.beforeSave()
 	stateSinkObject.Save(0, &d.vfsd)
@@ -203,6 +214,7 @@ func (d *dentry) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(21, &d.watches)
 }
 
+// +checklocksignore
 func (d *dentry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &d.vfsd)
 	stateSourceObject.Load(1, &d.refs)
@@ -243,6 +255,7 @@ func (fd *fileDescription) StateFields() []string {
 
 func (fd *fileDescription) beforeSave() {}
 
+// +checklocksignore
 func (fd *fileDescription) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.vfsfd)
@@ -252,6 +265,7 @@ func (fd *fileDescription) StateSave(stateSinkObject state.Sink) {
 
 func (fd *fileDescription) afterLoad() {}
 
+// +checklocksignore
 func (fd *fileDescription) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.vfsfd)
 	stateSourceObject.Load(1, &fd.FileDescriptionDefaultImpl)
@@ -274,6 +288,7 @@ func (fd *regularFileFD) StateFields() []string {
 
 func (fd *regularFileFD) beforeSave() {}
 
+// +checklocksignore
 func (fd *regularFileFD) StateSave(stateSinkObject state.Sink) {
 	fd.beforeSave()
 	stateSinkObject.Save(0, &fd.fileDescription)
@@ -285,6 +300,7 @@ func (fd *regularFileFD) StateSave(stateSinkObject state.Sink) {
 
 func (fd *regularFileFD) afterLoad() {}
 
+// +checklocksignore
 func (fd *regularFileFD) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &fd.fileDescription)
 	stateSourceObject.Load(1, &fd.copiedUp)