stateify: convert all packages to use explicit mode.

PiperOrigin-RevId: 207007153
Change-Id: Ifedf1cc3758dc18be16647a4ece9c840c1c636c9

2 files changed, 8 insertions, 26 deletions

diff --git a/pkg/sentry/fs/proc/seqfile/BUILD b/pkg/sentry/fs/proc/seqfile/BUILD
index c84f7e20d..53c475652 100644
--- a/pkg/sentry/fs/proc/seqfile/BUILD
+++ b/pkg/sentry/fs/proc/seqfile/BUILD
@@ -1,22 +1,10 @@
 package(licenses = ["notice"])  # Apache 2.0
 
-load("//tools/go_stateify:defs.bzl", "go_library", "go_stateify", "go_test")
-
-go_stateify(
-    name = "seqfile_state",
-    srcs = [
-        "seqfile.go",
-    ],
-    out = "seqfile_state.go",
-    package = "seqfile",
-)
+load("//tools/go_stateify:defs.bzl", "go_library", "go_test")
 
 go_library(
     name = "seqfile",
-    srcs = [
-        "seqfile.go",
-        "seqfile_state.go",
-    ],
+    srcs = ["seqfile.go"],
     importpath = "gvisor.googlesource.com/gvisor/pkg/sentry/fs/proc/seqfile",
     visibility = ["//pkg/sentry:internal"],
     deps = [
@@ -26,26 +14,16 @@ go_library(
         "//pkg/sentry/fs/ramfs",
         "//pkg/sentry/kernel/time",
         "//pkg/sentry/usermem",
-        "//pkg/state",
     ],
 )
 
-go_stateify(
-    name = "seqfile_test_state",
-    srcs = ["seqfile_test.go"],
-    out = "seqfile_test_state.go",
-    package = "seqfile",
-)
-
 go_test(
     name = "seqfile_test",
     size = "small",
-    srcs = [
-        "seqfile_test.go",
-        "seqfile_test_state.go",
-    ],
+    srcs = ["seqfile_test.go"],
     embed = [":seqfile"],
     deps = [
+        "//pkg/sentry/context",
         "//pkg/sentry/context/contexttest",
         "//pkg/sentry/fs",
         "//pkg/sentry/fs/ramfs/test",
diff --git a/pkg/sentry/fs/proc/seqfile/seqfile.go b/pkg/sentry/fs/proc/seqfile/seqfile.go
index c08565f8a..51cae5e37 100644
--- a/pkg/sentry/fs/proc/seqfile/seqfile.go
+++ b/pkg/sentry/fs/proc/seqfile/seqfile.go
@@ -30,6 +30,8 @@ import (
 type SeqHandle interface{}
 
 // SeqData holds the data for one unit in the file.
+//
+// +stateify savable
 type SeqData struct {
 	// The data to be returned to the user.
 	Buf []byte
@@ -82,6 +84,8 @@ func (s *SeqGenerationCounter) IsCurrent(generation int64) bool {
 }
 
 // SeqFile is used to provide dynamic files that can be ordered by record.
+//
+// +stateify savable
 type SeqFile struct {
 	ramfs.Entry