Automated rollback of changelist 207037226

PiperOrigin-RevId: 207125440
Change-Id: I6c572afb4d693ee72a0c458a988b0e96d191cd49

5 files changed, 15 insertions, 16 deletions

diff --git a/pkg/sentry/fs/tmpfs/BUILD b/pkg/sentry/fs/tmpfs/BUILD
index 473ab4296..cfe11ab02 100644
--- a/pkg/sentry/fs/tmpfs/BUILD
+++ b/pkg/sentry/fs/tmpfs/BUILD
@@ -1,18 +1,6 @@
 package(licenses = ["notice"])  # Apache 2.0
 
-load("//tools/go_stateify:defs.bzl", "go_library", "go_stateify", "go_test")
-
-go_stateify(
-    name = "tmpfs_state",
-    srcs = [
-        "file_regular.go",
-        "fs.go",
-        "inode_file.go",
-        "tmpfs.go",
-    ],
-    out = "tmpfs_state.go",
-    package = "tmpfs",
-)
+load("//tools/go_stateify:defs.bzl", "go_library", "go_test")
 
 go_library(
     name = "tmpfs",
@@ -22,13 +10,11 @@ go_library(
         "fs.go",
         "inode_file.go",
         "tmpfs.go",
-        "tmpfs_state.go",
     ],
     importpath = "gvisor.googlesource.com/gvisor/pkg/sentry/fs/tmpfs",
     visibility = ["//pkg/sentry:internal"],
     deps = [
         "//pkg/abi/linux",
-        "//pkg/log",
         "//pkg/sentry/context",
         "//pkg/sentry/device",
         "//pkg/sentry/fs",
@@ -41,7 +27,6 @@ go_library(
         "//pkg/sentry/safemem",
         "//pkg/sentry/usage",
         "//pkg/sentry/usermem",
-        "//pkg/state",
         "//pkg/tcpip/transport/unix",
         "//pkg/waiter",
     ],
diff --git a/pkg/sentry/fs/tmpfs/file_regular.go b/pkg/sentry/fs/tmpfs/file_regular.go
index 9811d90bc..342688f81 100644
--- a/pkg/sentry/fs/tmpfs/file_regular.go
+++ b/pkg/sentry/fs/tmpfs/file_regular.go
@@ -25,6 +25,8 @@ import (
 
 // regularFileOperations implements fs.FileOperations for a regular
 // tmpfs file.
+//
+// +stateify savable
 type regularFileOperations struct {
 	waiter.AlwaysReady   `state:"nosave"`
 	fsutil.NoopRelease   `state:"nosave"`
diff --git a/pkg/sentry/fs/tmpfs/fs.go b/pkg/sentry/fs/tmpfs/fs.go
index 5bd9ade52..ca620e65e 100644
--- a/pkg/sentry/fs/tmpfs/fs.go
+++ b/pkg/sentry/fs/tmpfs/fs.go
@@ -47,6 +47,8 @@ const (
 var modeRegexp = regexp.MustCompile("0[0-7][0-7][0-7]")
 
 // Filesystem is a tmpfs.
+//
+// +stateify savable
 type Filesystem struct{}
 
 func init() {
diff --git a/pkg/sentry/fs/tmpfs/inode_file.go b/pkg/sentry/fs/tmpfs/inode_file.go
index 4e803c9ff..1e4fe47d2 100644
--- a/pkg/sentry/fs/tmpfs/inode_file.go
+++ b/pkg/sentry/fs/tmpfs/inode_file.go
@@ -43,6 +43,8 @@ import (
 // include an InvalidatorRegion associated with that reference. When the
 // referenced portion of the file is removed (with Truncate), the associated
 // InvalidatorRegion is invalidated.
+//
+// +stateify savable
 type fileInodeOperations struct {
 	fsutil.DeprecatedFileOperations `state:"nosave"`
 	fsutil.InodeNotDirectory        `state:"nosave"`
diff --git a/pkg/sentry/fs/tmpfs/tmpfs.go b/pkg/sentry/fs/tmpfs/tmpfs.go
index 1cc7ae491..10cb5451d 100644
--- a/pkg/sentry/fs/tmpfs/tmpfs.go
+++ b/pkg/sentry/fs/tmpfs/tmpfs.go
@@ -49,6 +49,8 @@ func rename(ctx context.Context, oldParent *fs.Inode, oldName string, newParent
 }
 
 // Dir is a directory.
+//
+// +stateify savable
 type Dir struct {
 	ramfs.Dir
 
@@ -122,6 +124,8 @@ func (*Dir) StatFS(context.Context) (fs.Info, error) {
 }
 
 // Symlink is a symlink.
+//
+// +stateify savable
 type Symlink struct {
 	ramfs.Symlink
 }
@@ -149,6 +153,8 @@ func (s *Symlink) StatFS(context.Context) (fs.Info, error) {
 }
 
 // Socket is a socket.
+//
+// +stateify savable
 type Socket struct {
 	ramfs.Socket
 }
@@ -176,6 +182,8 @@ func (s *Socket) StatFS(context.Context) (fs.Info, error) {
 }
 
 // Fifo is a tmpfs named pipe.
+//
+// +stateify savable
 type Fifo struct {
 	ramfs.Entry
 }