Automated rollback of changelist 207037226

PiperOrigin-RevId: 207125440
Change-Id: I6c572afb4d693ee72a0c458a988b0e96d191cd49

3 files changed, 6 insertions, 15 deletions

diff --git a/pkg/sentry/fs/sys/BUILD b/pkg/sentry/fs/sys/BUILD
index 095ff1f25..bc24e980e 100644
--- a/pkg/sentry/fs/sys/BUILD
+++ b/pkg/sentry/fs/sys/BUILD
@@ -1,16 +1,6 @@
 package(licenses = ["notice"])  # Apache 2.0
 
-load("//tools/go_stateify:defs.bzl", "go_library", "go_stateify")
-
-go_stateify(
-    name = "sys_state",
-    srcs = [
-        "fs.go",
-        "sys.go",
-    ],
-    out = "sys_state.go",
-    package = "sys",
-)
+load("//tools/go_stateify:defs.bzl", "go_library")
 
 go_library(
     name = "sys",
@@ -18,7 +8,6 @@ go_library(
         "device.go",
         "fs.go",
         "sys.go",
-        "sys_state.go",
     ],
     importpath = "gvisor.googlesource.com/gvisor/pkg/sentry/fs/sys",
     visibility = ["//pkg/sentry:internal"],
@@ -28,6 +17,5 @@ go_library(
         "//pkg/sentry/fs",
         "//pkg/sentry/fs/ramfs",
         "//pkg/sentry/usermem",
-        "//pkg/state",
     ],
 )
diff --git a/pkg/sentry/fs/sys/fs.go b/pkg/sentry/fs/sys/fs.go
index c6d5f7fd8..625525540 100644
--- a/pkg/sentry/fs/sys/fs.go
+++ b/pkg/sentry/fs/sys/fs.go
@@ -20,6 +20,8 @@ import (
 )
 
 // filesystem is a sysfs.
+//
+// +stateify savable
 type filesystem struct{}
 
 func init() {
diff --git a/pkg/sentry/fs/sys/sys.go b/pkg/sentry/fs/sys/sys.go
index ccf56f644..b9b2fb4a1 100644
--- a/pkg/sentry/fs/sys/sys.go
+++ b/pkg/sentry/fs/sys/sys.go
@@ -22,12 +22,13 @@ import (
 	"gvisor.googlesource.com/gvisor/pkg/sentry/usermem"
 )
 
-type Dir struct {
+// +stateify savable
+type dir struct {
 	ramfs.Dir
 }
 
 func newDir(ctx context.Context, msrc *fs.MountSource, contents map[string]*fs.Inode) *fs.Inode {
-	d := &Dir{}
+	d := &dir{}
 	d.InitDir(ctx, contents, fs.RootOwner, fs.FilePermsFromMode(0555))
 	return fs.NewInode(d, msrc, fs.StableAttr{
 		DeviceID:  sysfsDevice.DeviceID(),