Merge release-20200422.0-51-g1f4087e (automated)

2 files changed, 27 insertions, 17 deletions

diff --git a/pkg/sentry/vfs/vfs_state_autogen.go b/pkg/sentry/vfs/vfs_state_autogen.go
index 7fc34dedd..0cf6ed48d 100755
--- a/pkg/sentry/vfs/vfs_state_autogen.go
+++ b/pkg/sentry/vfs/vfs_state_autogen.go
@@ -1,8 +1,5 @@
 // automatically generated by stateify.
 
-// +build go1.12
-// +build !go1.15
-
 package vfs
 
 import (
@@ -150,19 +147,6 @@ func (x *MountNamespace) load(m state.Map) {
 	m.Load("mountpoints", &x.mountpoints)
 }
 
-func (x *mountTable) beforeSave() {}
-func (x *mountTable) save(m state.Map) {
-	x.beforeSave()
-	m.Save("seed", &x.seed)
-	m.Save("size", &x.size)
-}
-
-func (x *mountTable) afterLoad() {}
-func (x *mountTable) load(m state.Map) {
-	m.Load("seed", &x.seed)
-	m.Load("size", &x.size)
-}
-
 func (x *VirtualFilesystem) beforeSave() {}
 func (x *VirtualFilesystem) save(m state.Map) {
 	x.beforeSave()
@@ -211,7 +195,6 @@ func init() {
 	state.Register("pkg/sentry/vfs.registeredFilesystemType", (*registeredFilesystemType)(nil), state.Fns{Save: (*registeredFilesystemType).save, Load: (*registeredFilesystemType).load})
 	state.Register("pkg/sentry/vfs.Mount", (*Mount)(nil), state.Fns{Save: (*Mount).save, Load: (*Mount).load})
 	state.Register("pkg/sentry/vfs.MountNamespace", (*MountNamespace)(nil), state.Fns{Save: (*MountNamespace).save, Load: (*MountNamespace).load})
-	state.Register("pkg/sentry/vfs.mountTable", (*mountTable)(nil), state.Fns{Save: (*mountTable).save, Load: (*mountTable).load})
 	state.Register("pkg/sentry/vfs.VirtualFilesystem", (*VirtualFilesystem)(nil), state.Fns{Save: (*VirtualFilesystem).save, Load: (*VirtualFilesystem).load})
 	state.Register("pkg/sentry/vfs.VirtualDentry", (*VirtualDentry)(nil), state.Fns{Save: (*VirtualDentry).save, Load: (*VirtualDentry).load})
 }
diff --git a/pkg/sentry/vfs/vfs_unsafe_state_autogen.go b/pkg/sentry/vfs/vfs_unsafe_state_autogen.go
new file mode 100755
index 000000000..8b198c5dd
--- /dev/null
+++ b/pkg/sentry/vfs/vfs_unsafe_state_autogen.go
@@ -0,0 +1,27 @@
+// automatically generated by stateify.
+
+// +build go1.12
+// +build !go1.15
+
+package vfs
+
+import (
+	"gvisor.dev/gvisor/pkg/state"
+)
+
+func (x *mountTable) beforeSave() {}
+func (x *mountTable) save(m state.Map) {
+	x.beforeSave()
+	m.Save("seed", &x.seed)
+	m.Save("size", &x.size)
+}
+
+func (x *mountTable) afterLoad() {}
+func (x *mountTable) load(m state.Map) {
+	m.Load("seed", &x.seed)
+	m.Load("size", &x.size)
+}
+
+func init() {
+	state.Register("pkg/sentry/vfs.mountTable", (*mountTable)(nil), state.Fns{Save: (*mountTable).save, Load: (*mountTable).load})
+}