Automated rollback of changelist 207037226

PiperOrigin-RevId: 207125440
Change-Id: I6c572afb4d693ee72a0c458a988b0e96d191cd49

7 files changed, 13 insertions, 19 deletions

diff --git a/pkg/sentry/kernel/pipe/BUILD b/pkg/sentry/kernel/pipe/BUILD
index 4600d19bd..19b23c6d2 100644
--- a/pkg/sentry/kernel/pipe/BUILD
+++ b/pkg/sentry/kernel/pipe/BUILD
@@ -1,20 +1,6 @@
 package(licenses = ["notice"])  # Apache 2.0
 
-load("//tools/go_stateify:defs.bzl", "go_library", "go_stateify", "go_test")
-
-go_stateify(
-    name = "pipe_state",
-    srcs = [
-        "buffers.go",
-        "node.go",
-        "pipe.go",
-        "reader.go",
-        "reader_writer.go",
-        "writer.go",
-    ],
-    out = "pipe_state.go",
-    package = "pipe",
-)
+load("//tools/go_stateify:defs.bzl", "go_library", "go_test")
 
 go_library(
     name = "pipe",
@@ -23,7 +9,6 @@ go_library(
         "device.go",
         "node.go",
         "pipe.go",
-        "pipe_state.go",
         "reader.go",
         "reader_writer.go",
         "writer.go",
@@ -34,15 +19,12 @@ go_library(
         "//pkg/abi/linux",
         "//pkg/amutex",
         "//pkg/ilist",
-        "//pkg/log",
-        "//pkg/refs",
         "//pkg/sentry/arch",
         "//pkg/sentry/context",
         "//pkg/sentry/device",
         "//pkg/sentry/fs",
         "//pkg/sentry/fs/fsutil",
         "//pkg/sentry/usermem",
-        "//pkg/state",
         "//pkg/syserror",
         "//pkg/waiter",
     ],
diff --git a/pkg/sentry/kernel/pipe/buffers.go b/pkg/sentry/kernel/pipe/buffers.go
index f300537c5..a82e45c3f 100644
--- a/pkg/sentry/kernel/pipe/buffers.go
+++ b/pkg/sentry/kernel/pipe/buffers.go
@@ -20,6 +20,8 @@ import (
 
 // Buffer encapsulates a queueable byte buffer that can
 // easily be truncated.  It is designed only for use with pipes.
+//
+// +stateify savable
 type Buffer struct {
 	ilist.Entry
 	data []byte
diff --git a/pkg/sentry/kernel/pipe/node.go b/pkg/sentry/kernel/pipe/node.go
index e418cf174..23d692da1 100644
--- a/pkg/sentry/kernel/pipe/node.go
+++ b/pkg/sentry/kernel/pipe/node.go
@@ -24,6 +24,8 @@ import (
 )
 
 // inodeOperations wraps fs.InodeOperations operations with common pipe opening semantics.
+//
+// +stateify savable
 type inodeOperations struct {
 	fs.InodeOperations
 
diff --git a/pkg/sentry/kernel/pipe/pipe.go b/pkg/sentry/kernel/pipe/pipe.go
index 9a21df5b4..ced2559a7 100644
--- a/pkg/sentry/kernel/pipe/pipe.go
+++ b/pkg/sentry/kernel/pipe/pipe.go
@@ -41,6 +41,8 @@ const DefaultPipeSize = 65536
 // Pipe is an encapsulation of a platform-independent pipe.
 // It manages a buffered byte queue shared between a reader/writer
 // pair.
+//
+// +stateify savable
 type Pipe struct {
 	waiter.Queue `state:"nosave"`
 
diff --git a/pkg/sentry/kernel/pipe/reader.go b/pkg/sentry/kernel/pipe/reader.go
index 40d5e4943..1fa5e9a32 100644
--- a/pkg/sentry/kernel/pipe/reader.go
+++ b/pkg/sentry/kernel/pipe/reader.go
@@ -20,6 +20,8 @@ import (
 
 // Reader satisfies the fs.FileOperations interface for read-only pipes.
 // Reader should be used with !fs.FileFlags.Write to reject writes.
+//
+// +stateify savable
 type Reader struct {
 	ReaderWriter
 }
diff --git a/pkg/sentry/kernel/pipe/reader_writer.go b/pkg/sentry/kernel/pipe/reader_writer.go
index dc642a3a6..82607367b 100644
--- a/pkg/sentry/kernel/pipe/reader_writer.go
+++ b/pkg/sentry/kernel/pipe/reader_writer.go
@@ -31,6 +31,8 @@ import (
 // read and write requests. This should only be used directly for named pipes.
 // pipe(2) and pipe2(2) only support unidirectional pipes and should use
 // either pipe.Reader or pipe.Writer.
+//
+// +stateify savable
 type ReaderWriter struct {
 	fsutil.PipeSeek      `state:"nosave"`
 	fsutil.NotDirReaddir `state:"nosave"`
diff --git a/pkg/sentry/kernel/pipe/writer.go b/pkg/sentry/kernel/pipe/writer.go
index fd13008ac..d93324b53 100644
--- a/pkg/sentry/kernel/pipe/writer.go
+++ b/pkg/sentry/kernel/pipe/writer.go
@@ -20,6 +20,8 @@ import (
 
 // Writer satisfies the fs.FileOperations interface for write-only pipes.
 // Writer should be used with !fs.FileFlags.Read to reject reads.
+//
+// +stateify savable
 type Writer struct {
 	ReaderWriter
 }