Merge release-20200219.0-69-g463f421 (automated)

1 files changed, 2 insertions, 50 deletions

diff --git a/pkg/sentry/kernel/pipe/pipe_state_autogen.go b/pkg/sentry/kernel/pipe/pipe_state_autogen.go
index f7f9f32dc..b49ab46f9 100755
--- a/pkg/sentry/kernel/pipe/pipe_state_autogen.go
+++ b/pkg/sentry/kernel/pipe/pipe_state_autogen.go
@@ -6,49 +6,6 @@ import (
 	"gvisor.dev/gvisor/pkg/state"
 )
 
-func (x *buffer) beforeSave() {}
-func (x *buffer) save(m state.Map) {
-	x.beforeSave()
-	m.Save("data", &x.data)
-	m.Save("read", &x.read)
-	m.Save("write", &x.write)
-	m.Save("bufferEntry", &x.bufferEntry)
-}
-
-func (x *buffer) afterLoad() {}
-func (x *buffer) load(m state.Map) {
-	m.Load("data", &x.data)
-	m.Load("read", &x.read)
-	m.Load("write", &x.write)
-	m.Load("bufferEntry", &x.bufferEntry)
-}
-
-func (x *bufferList) beforeSave() {}
-func (x *bufferList) save(m state.Map) {
-	x.beforeSave()
-	m.Save("head", &x.head)
-	m.Save("tail", &x.tail)
-}
-
-func (x *bufferList) afterLoad() {}
-func (x *bufferList) load(m state.Map) {
-	m.Load("head", &x.head)
-	m.Load("tail", &x.tail)
-}
-
-func (x *bufferEntry) beforeSave() {}
-func (x *bufferEntry) save(m state.Map) {
-	x.beforeSave()
-	m.Save("next", &x.next)
-	m.Save("prev", &x.prev)
-}
-
-func (x *bufferEntry) afterLoad() {}
-func (x *bufferEntry) load(m state.Map) {
-	m.Load("next", &x.next)
-	m.Load("prev", &x.prev)
-}
-
 func (x *inodeOperations) beforeSave() {}
 func (x *inodeOperations) save(m state.Map) {
 	x.beforeSave()
@@ -69,9 +26,8 @@ func (x *Pipe) save(m state.Map) {
 	m.Save("atomicIOBytes", &x.atomicIOBytes)
 	m.Save("readers", &x.readers)
 	m.Save("writers", &x.writers)
-	m.Save("data", &x.data)
+	m.Save("view", &x.view)
 	m.Save("max", &x.max)
-	m.Save("size", &x.size)
 	m.Save("hadWriter", &x.hadWriter)
 }
 
@@ -81,9 +37,8 @@ func (x *Pipe) load(m state.Map) {
 	m.Load("atomicIOBytes", &x.atomicIOBytes)
 	m.Load("readers", &x.readers)
 	m.Load("writers", &x.writers)
-	m.Load("data", &x.data)
+	m.Load("view", &x.view)
 	m.Load("max", &x.max)
-	m.Load("size", &x.size)
 	m.Load("hadWriter", &x.hadWriter)
 }
 
@@ -121,9 +76,6 @@ func (x *Writer) load(m state.Map) {
 }
 
 func init() {
-	state.Register("pkg/sentry/kernel/pipe.buffer", (*buffer)(nil), state.Fns{Save: (*buffer).save, Load: (*buffer).load})
-	state.Register("pkg/sentry/kernel/pipe.bufferList", (*bufferList)(nil), state.Fns{Save: (*bufferList).save, Load: (*bufferList).load})
-	state.Register("pkg/sentry/kernel/pipe.bufferEntry", (*bufferEntry)(nil), state.Fns{Save: (*bufferEntry).save, Load: (*bufferEntry).load})
 	state.Register("pkg/sentry/kernel/pipe.inodeOperations", (*inodeOperations)(nil), state.Fns{Save: (*inodeOperations).save, Load: (*inodeOperations).load})
 	state.Register("pkg/sentry/kernel/pipe.Pipe", (*Pipe)(nil), state.Fns{Save: (*Pipe).save, Load: (*Pipe).load})
 	state.Register("pkg/sentry/kernel/pipe.Reader", (*Reader)(nil), state.Fns{Save: (*Reader).save, Load: (*Reader).load})