Merge release-20200928.0-66-ga55bd73d4 (automated)

1 files changed, 11 insertions, 11 deletions

diff --git a/pkg/sentry/kernel/signalfd/signalfd_state_autogen.go b/pkg/sentry/kernel/signalfd/signalfd_state_autogen.go
index 089a35b60..6c608aaa4 100644
--- a/pkg/sentry/kernel/signalfd/signalfd_state_autogen.go
+++ b/pkg/sentry/kernel/signalfd/signalfd_state_autogen.go
@@ -6,30 +6,30 @@ import (
 	"gvisor.dev/gvisor/pkg/state"
 )
 
-func (x *SignalOperations) StateTypeName() string {
+func (s *SignalOperations) StateTypeName() string {
 	return "pkg/sentry/kernel/signalfd.SignalOperations"
 }
 
-func (x *SignalOperations) StateFields() []string {
+func (s *SignalOperations) StateFields() []string {
 	return []string{
 		"target",
 		"mask",
 	}
 }
 
-func (x *SignalOperations) beforeSave() {}
+func (s *SignalOperations) beforeSave() {}
 
-func (x *SignalOperations) StateSave(m state.Sink) {
-	x.beforeSave()
-	m.Save(0, &x.target)
-	m.Save(1, &x.mask)
+func (s *SignalOperations) StateSave(stateSinkObject state.Sink) {
+	s.beforeSave()
+	stateSinkObject.Save(0, &s.target)
+	stateSinkObject.Save(1, &s.mask)
 }
 
-func (x *SignalOperations) afterLoad() {}
+func (s *SignalOperations) afterLoad() {}
 
-func (x *SignalOperations) StateLoad(m state.Source) {
-	m.Load(0, &x.target)
-	m.Load(1, &x.mask)
+func (s *SignalOperations) StateLoad(stateSourceObject state.Source) {
+	stateSourceObject.Load(0, &s.target)
+	stateSourceObject.Load(1, &s.mask)
 }
 
 func init() {