From 60add78980737a7330100d98bf6a214892dee3c0 Mon Sep 17 00:00:00 2001
From: Michael Pratt <mpratt@google.com>
Date: Wed, 1 Aug 2018 19:56:12 -0700
Subject: Automated rollback of changelist 207007153

PiperOrigin-RevId: 207037226
Change-Id: I8b5f1a056d4f3eab17846f2e0193bb737ecb5428
---
 pkg/sentry/fs/ramfs/BUILD      | 21 ++++++++++++++++++++-
 pkg/sentry/fs/ramfs/dir.go     |  2 --
 pkg/sentry/fs/ramfs/ramfs.go   |  2 --
 pkg/sentry/fs/ramfs/socket.go  |  2 --
 pkg/sentry/fs/ramfs/symlink.go |  2 --
 pkg/sentry/fs/ramfs/test/BUILD | 18 ++++++++++++++++--
 6 files changed, 36 insertions(+), 11 deletions(-)

(limited to 'pkg/sentry/fs/ramfs')

diff --git a/pkg/sentry/fs/ramfs/BUILD b/pkg/sentry/fs/ramfs/BUILD
index 5230157fe..d84f2c624 100644
--- a/pkg/sentry/fs/ramfs/BUILD
+++ b/pkg/sentry/fs/ramfs/BUILD
@@ -1,6 +1,19 @@
 package(licenses = ["notice"])  # Apache 2.0
 
-load("//tools/go_stateify:defs.bzl", "go_library", "go_test")
+load("//tools/go_stateify:defs.bzl", "go_library", "go_stateify", "go_test")
+
+go_stateify(
+    name = "ramfs_state",
+    srcs = [
+        "dir.go",
+        "file.go",
+        "ramfs.go",
+        "socket.go",
+        "symlink.go",
+    ],
+    out = "ramfs_state.go",
+    package = "ramfs",
+)
 
 go_library(
     name = "ramfs",
@@ -8,6 +21,7 @@ go_library(
         "dir.go",
         "file.go",
         "ramfs.go",
+        "ramfs_state.go",
         "socket.go",
         "symlink.go",
         "tree.go",
@@ -15,8 +29,12 @@ go_library(
     importpath = "gvisor.googlesource.com/gvisor/pkg/sentry/fs/ramfs",
     visibility = ["//pkg/sentry:internal"],
     deps = [
+        "//pkg/amutex",
+        "//pkg/log",
+        "//pkg/refs",
         "//pkg/secio",
         "//pkg/sentry/context",
+        "//pkg/sentry/device",
         "//pkg/sentry/fs",
         "//pkg/sentry/fs/anon",
         "//pkg/sentry/fs/fsutil",
@@ -24,6 +42,7 @@ go_library(
         "//pkg/sentry/memmap",
         "//pkg/sentry/safemem",
         "//pkg/sentry/usermem",
+        "//pkg/state",
         "//pkg/syserror",
         "//pkg/tcpip/transport/unix",
         "//pkg/waiter",
diff --git a/pkg/sentry/fs/ramfs/dir.go b/pkg/sentry/fs/ramfs/dir.go
index 04432f28c..19d5612ed 100644
--- a/pkg/sentry/fs/ramfs/dir.go
+++ b/pkg/sentry/fs/ramfs/dir.go
@@ -44,8 +44,6 @@ type CreateOps struct {
 }
 
 // Dir represents a single directory in the filesystem.
-//
-// +stateify savable
 type Dir struct {
 	Entry
 
diff --git a/pkg/sentry/fs/ramfs/ramfs.go b/pkg/sentry/fs/ramfs/ramfs.go
index 13e72e775..d6cfaf753 100644
--- a/pkg/sentry/fs/ramfs/ramfs.go
+++ b/pkg/sentry/fs/ramfs/ramfs.go
@@ -60,8 +60,6 @@ var (
 
 // Entry represents common internal state for file and directory nodes.
 // This may be used by other packages to easily create ramfs files.
-//
-// +stateify savable
 type Entry struct {
 	waiter.AlwaysReady    `state:"nosave"`
 	fsutil.NoMappable     `state:"nosave"`
diff --git a/pkg/sentry/fs/ramfs/socket.go b/pkg/sentry/fs/ramfs/socket.go
index 93427a1ff..b0c79325f 100644
--- a/pkg/sentry/fs/ramfs/socket.go
+++ b/pkg/sentry/fs/ramfs/socket.go
@@ -21,8 +21,6 @@ import (
 )
 
 // Socket represents a socket.
-//
-// +stateify savable
 type Socket struct {
 	Entry
 
diff --git a/pkg/sentry/fs/ramfs/symlink.go b/pkg/sentry/fs/ramfs/symlink.go
index 1c54d9991..9bbf78619 100644
--- a/pkg/sentry/fs/ramfs/symlink.go
+++ b/pkg/sentry/fs/ramfs/symlink.go
@@ -22,8 +22,6 @@ import (
 )
 
 // Symlink represents a symlink.
-//
-// +stateify savable
 type Symlink struct {
 	Entry
 
diff --git a/pkg/sentry/fs/ramfs/test/BUILD b/pkg/sentry/fs/ramfs/test/BUILD
index 187eac49d..57fee45e2 100644
--- a/pkg/sentry/fs/ramfs/test/BUILD
+++ b/pkg/sentry/fs/ramfs/test/BUILD
@@ -1,16 +1,30 @@
 package(licenses = ["notice"])  # Apache 2.0
 
-load("//tools/go_stateify:defs.bzl", "go_library")
+load("//tools/go_stateify:defs.bzl", "go_library", "go_stateify")
+
+go_stateify(
+    name = "test_state",
+    srcs = [
+        "test.go",
+    ],
+    out = "test_state.go",
+    package = "test",
+)
 
 go_library(
     name = "test",
     testonly = 1,
-    srcs = ["test.go"],
+    srcs = [
+        "test.go",
+        "test_state.go",
+    ],
     importpath = "gvisor.googlesource.com/gvisor/pkg/sentry/fs/ramfs/test",
     visibility = ["//pkg/sentry:internal"],
     deps = [
         "//pkg/sentry/context",
+        "//pkg/sentry/device",
         "//pkg/sentry/fs",
         "//pkg/sentry/fs/ramfs",
+        "//pkg/state",
     ],
 )
-- 
cgit v1.2.3