1 files changed, 104 insertions, 104 deletions

diff --git a/pkg/sentry/fsimpl/sys/sys_state_autogen.go b/pkg/sentry/fsimpl/sys/sys_state_autogen.go
index 14d4efce9..6ba7397ba 100644
--- a/pkg/sentry/fsimpl/sys/sys_state_autogen.go
+++ b/pkg/sentry/fsimpl/sys/sys_state_autogen.go
@@ -6,34 +6,34 @@ import (
 	"gvisor.dev/gvisor/pkg/state"
 )
 
-func (x *dirRefs) StateTypeName() string {
+func (d *dirRefs) StateTypeName() string {
 	return "pkg/sentry/fsimpl/sys.dirRefs"
 }
 
-func (x *dirRefs) StateFields() []string {
+func (d *dirRefs) StateFields() []string {
 	return []string{
 		"refCount",
 	}
 }
 
-func (x *dirRefs) beforeSave() {}
+func (d *dirRefs) beforeSave() {}
 
-func (x *dirRefs) StateSave(m state.Sink) {
-	x.beforeSave()
-	m.Save(0, &x.refCount)
+func (d *dirRefs) StateSave(stateSinkObject state.Sink) {
+	d.beforeSave()
+	stateSinkObject.Save(0, &d.refCount)
 }
 
-func (x *dirRefs) afterLoad() {}
+func (d *dirRefs) afterLoad() {}
 
-func (x *dirRefs) StateLoad(m state.Source) {
-	m.Load(0, &x.refCount)
+func (d *dirRefs) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &d.refCount)
 }
 
-func (x *kcovInode) StateTypeName() string {
+func (k *kcovInode) StateTypeName() string {
 	return "pkg/sentry/fsimpl/sys.kcovInode"
 }
 
-func (x *kcovInode) StateFields() []string {
+func (k *kcovInode) StateFields() []string {
 	return []string{
 		"InodeAttrs",
 		"InodeNoopRefCount",
@@ -43,32 +43,32 @@ func (x *kcovInode) StateFields() []string {
 	}
 }
 
-func (x *kcovInode) beforeSave() {}
+func (k *kcovInode) beforeSave() {}
 
-func (x *kcovInode) StateSave(m state.Sink) {
-	x.beforeSave()
-	m.Save(0, &x.InodeAttrs)
-	m.Save(1, &x.InodeNoopRefCount)
-	m.Save(2, &x.InodeNotDirectory)
-	m.Save(3, &x.InodeNotSymlink)
-	m.Save(4, &x.implStatFS)
+func (k *kcovInode) StateSave(stateSinkObject state.Sink) {
+	k.beforeSave()
+	stateSinkObject.Save(0, &k.InodeAttrs)
+	stateSinkObject.Save(1, &k.InodeNoopRefCount)
+	stateSinkObject.Save(2, &k.InodeNotDirectory)
+	stateSinkObject.Save(3, &k.InodeNotSymlink)
+	stateSinkObject.Save(4, &k.implStatFS)
 }
 
-func (x *kcovInode) afterLoad() {}
+func (k *kcovInode) afterLoad() {}
 
-func (x *kcovInode) StateLoad(m state.Source) {
-	m.Load(0, &x.InodeAttrs)
-	m.Load(1, &x.InodeNoopRefCount)
-	m.Load(2, &x.InodeNotDirectory)
-	m.Load(3, &x.InodeNotSymlink)
-	m.Load(4, &x.implStatFS)
+func (k *kcovInode) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &k.InodeAttrs)
+	stateSourceObject.Load(1, &k.InodeNoopRefCount)
+	stateSourceObject.Load(2, &k.InodeNotDirectory)
+	stateSourceObject.Load(3, &k.InodeNotSymlink)
+	stateSourceObject.Load(4, &k.implStatFS)
 }
 
-func (x *kcovFD) StateTypeName() string {
+func (k *kcovFD) StateTypeName() string {
 	return "pkg/sentry/fsimpl/sys.kcovFD"
 }
 
-func (x *kcovFD) StateFields() []string {
+func (k *kcovFD) StateFields() []string {
 	return []string{
 		"FileDescriptionDefaultImpl",
 		"NoLockFD",
@@ -78,77 +78,77 @@ func (x *kcovFD) StateFields() []string {
 	}
 }
 
-func (x *kcovFD) beforeSave() {}
+func (k *kcovFD) beforeSave() {}
 
-func (x *kcovFD) StateSave(m state.Sink) {
-	x.beforeSave()
-	m.Save(0, &x.FileDescriptionDefaultImpl)
-	m.Save(1, &x.NoLockFD)
-	m.Save(2, &x.vfsfd)
-	m.Save(3, &x.inode)
-	m.Save(4, &x.kcov)
+func (k *kcovFD) StateSave(stateSinkObject state.Sink) {
+	k.beforeSave()
+	stateSinkObject.Save(0, &k.FileDescriptionDefaultImpl)
+	stateSinkObject.Save(1, &k.NoLockFD)
+	stateSinkObject.Save(2, &k.vfsfd)
+	stateSinkObject.Save(3, &k.inode)
+	stateSinkObject.Save(4, &k.kcov)
 }
 
-func (x *kcovFD) afterLoad() {}
+func (k *kcovFD) afterLoad() {}
 
-func (x *kcovFD) StateLoad(m state.Source) {
-	m.Load(0, &x.FileDescriptionDefaultImpl)
-	m.Load(1, &x.NoLockFD)
-	m.Load(2, &x.vfsfd)
-	m.Load(3, &x.inode)
-	m.Load(4, &x.kcov)
+func (k *kcovFD) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &k.FileDescriptionDefaultImpl)
+	stateSourceObject.Load(1, &k.NoLockFD)
+	stateSourceObject.Load(2, &k.vfsfd)
+	stateSourceObject.Load(3, &k.inode)
+	stateSourceObject.Load(4, &k.kcov)
 }
 
-func (x *FilesystemType) StateTypeName() string {
+func (f *FilesystemType) StateTypeName() string {
 	return "pkg/sentry/fsimpl/sys.FilesystemType"
 }
 
-func (x *FilesystemType) StateFields() []string {
+func (f *FilesystemType) StateFields() []string {
 	return []string{}
 }
 
-func (x *FilesystemType) beforeSave() {}
+func (f *FilesystemType) beforeSave() {}
 
-func (x *FilesystemType) StateSave(m state.Sink) {
-	x.beforeSave()
+func (f *FilesystemType) StateSave(stateSinkObject state.Sink) {
+	f.beforeSave()
 }
 
-func (x *FilesystemType) afterLoad() {}
+func (f *FilesystemType) afterLoad() {}
 
-func (x *FilesystemType) StateLoad(m state.Source) {
+func (f *FilesystemType) StateLoad(stateSourceObject state.Source) {
 }
 
-func (x *filesystem) StateTypeName() string {
+func (f *filesystem) StateTypeName() string {
 	return "pkg/sentry/fsimpl/sys.filesystem"
 }
 
-func (x *filesystem) StateFields() []string {
+func (f *filesystem) StateFields() []string {
 	return []string{
 		"Filesystem",
 		"devMinor",
 	}
 }
 
-func (x *filesystem) beforeSave() {}
+func (f *filesystem) beforeSave() {}
 
-func (x *filesystem) StateSave(m state.Sink) {
-	x.beforeSave()
-	m.Save(0, &x.Filesystem)
-	m.Save(1, &x.devMinor)
+func (f *filesystem) StateSave(stateSinkObject state.Sink) {
+	f.beforeSave()
+	stateSinkObject.Save(0, &f.Filesystem)
+	stateSinkObject.Save(1, &f.devMinor)
 }
 
-func (x *filesystem) afterLoad() {}
+func (f *filesystem) afterLoad() {}
 
-func (x *filesystem) StateLoad(m state.Source) {
-	m.Load(0, &x.Filesystem)
-	m.Load(1, &x.devMinor)
+func (f *filesystem) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &f.Filesystem)
+	stateSourceObject.Load(1, &f.devMinor)
 }
 
-func (x *dir) StateTypeName() string {
+func (d *dir) StateTypeName() string {
 	return "pkg/sentry/fsimpl/sys.dir"
 }
 
-func (x *dir) StateFields() []string {
+func (d *dir) StateFields() []string {
 	return []string{
 		"dirRefs",
 		"InodeAttrs",
@@ -161,38 +161,38 @@ func (x *dir) StateFields() []string {
 	}
 }
 
-func (x *dir) beforeSave() {}
+func (d *dir) beforeSave() {}
 
-func (x *dir) StateSave(m state.Sink) {
-	x.beforeSave()
-	m.Save(0, &x.dirRefs)
-	m.Save(1, &x.InodeAttrs)
-	m.Save(2, &x.InodeNoDynamicLookup)
-	m.Save(3, &x.InodeNotSymlink)
-	m.Save(4, &x.InodeDirectoryNoNewChildren)
-	m.Save(5, &x.OrderedChildren)
-	m.Save(6, &x.locks)
-	m.Save(7, &x.dentry)
+func (d *dir) StateSave(stateSinkObject state.Sink) {
+	d.beforeSave()
+	stateSinkObject.Save(0, &d.dirRefs)
+	stateSinkObject.Save(1, &d.InodeAttrs)
+	stateSinkObject.Save(2, &d.InodeNoDynamicLookup)
+	stateSinkObject.Save(3, &d.InodeNotSymlink)
+	stateSinkObject.Save(4, &d.InodeDirectoryNoNewChildren)
+	stateSinkObject.Save(5, &d.OrderedChildren)
+	stateSinkObject.Save(6, &d.locks)
+	stateSinkObject.Save(7, &d.dentry)
 }
 
-func (x *dir) afterLoad() {}
+func (d *dir) afterLoad() {}
 
-func (x *dir) StateLoad(m state.Source) {
-	m.Load(0, &x.dirRefs)
-	m.Load(1, &x.InodeAttrs)
-	m.Load(2, &x.InodeNoDynamicLookup)
-	m.Load(3, &x.InodeNotSymlink)
-	m.Load(4, &x.InodeDirectoryNoNewChildren)
-	m.Load(5, &x.OrderedChildren)
-	m.Load(6, &x.locks)
-	m.Load(7, &x.dentry)
+func (d *dir) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &d.dirRefs)
+	stateSourceObject.Load(1, &d.InodeAttrs)
+	stateSourceObject.Load(2, &d.InodeNoDynamicLookup)
+	stateSourceObject.Load(3, &d.InodeNotSymlink)
+	stateSourceObject.Load(4, &d.InodeDirectoryNoNewChildren)
+	stateSourceObject.Load(5, &d.OrderedChildren)
+	stateSourceObject.Load(6, &d.locks)
+	stateSourceObject.Load(7, &d.dentry)
 }
 
-func (x *cpuFile) StateTypeName() string {
+func (c *cpuFile) StateTypeName() string {
 	return "pkg/sentry/fsimpl/sys.cpuFile"
 }
 
-func (x *cpuFile) StateFields() []string {
+func (c *cpuFile) StateFields() []string {
 	return []string{
 		"implStatFS",
 		"DynamicBytesFile",
@@ -200,40 +200,40 @@ func (x *cpuFile) StateFields() []string {
 	}
 }
 
-func (x *cpuFile) beforeSave() {}
+func (c *cpuFile) beforeSave() {}
 
-func (x *cpuFile) StateSave(m state.Sink) {
-	x.beforeSave()
-	m.Save(0, &x.implStatFS)
-	m.Save(1, &x.DynamicBytesFile)
-	m.Save(2, &x.maxCores)
+func (c *cpuFile) StateSave(stateSinkObject state.Sink) {
+	c.beforeSave()
+	stateSinkObject.Save(0, &c.implStatFS)
+	stateSinkObject.Save(1, &c.DynamicBytesFile)
+	stateSinkObject.Save(2, &c.maxCores)
 }
 
-func (x *cpuFile) afterLoad() {}
+func (c *cpuFile) afterLoad() {}
 
-func (x *cpuFile) StateLoad(m state.Source) {
-	m.Load(0, &x.implStatFS)
-	m.Load(1, &x.DynamicBytesFile)
-	m.Load(2, &x.maxCores)
+func (c *cpuFile) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &c.implStatFS)
+	stateSourceObject.Load(1, &c.DynamicBytesFile)
+	stateSourceObject.Load(2, &c.maxCores)
 }
 
-func (x *implStatFS) StateTypeName() string {
+func (i *implStatFS) StateTypeName() string {
 	return "pkg/sentry/fsimpl/sys.implStatFS"
 }
 
-func (x *implStatFS) StateFields() []string {
+func (i *implStatFS) StateFields() []string {
 	return []string{}
 }
 
-func (x *implStatFS) beforeSave() {}
+func (i *implStatFS) beforeSave() {}
 
-func (x *implStatFS) StateSave(m state.Sink) {
-	x.beforeSave()
+func (i *implStatFS) StateSave(stateSinkObject state.Sink) {
+	i.beforeSave()
 }
 
-func (x *implStatFS) afterLoad() {}
+func (i *implStatFS) afterLoad() {}
 
-func (x *implStatFS) StateLoad(m state.Source) {
+func (i *implStatFS) StateLoad(stateSourceObject state.Source) {
 }
 
 func init() {