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/dev/BUILD     | 20 +++++++++++++++++++-
 pkg/sentry/fs/dev/dev.go    |  2 --
 pkg/sentry/fs/dev/fs.go     |  2 --
 pkg/sentry/fs/dev/full.go   |  2 --
 pkg/sentry/fs/dev/null.go   |  3 ---
 pkg/sentry/fs/dev/random.go |  1 -
 6 files changed, 19 insertions(+), 11 deletions(-)

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

diff --git a/pkg/sentry/fs/dev/BUILD b/pkg/sentry/fs/dev/BUILD
index fc069bb5f..ea41615fd 100644
--- a/pkg/sentry/fs/dev/BUILD
+++ b/pkg/sentry/fs/dev/BUILD
@@ -1,11 +1,25 @@
 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 = "dev_state",
+    srcs = [
+        "dev.go",
+        "fs.go",
+        "full.go",
+        "null.go",
+        "random.go",
+    ],
+    out = "dev_state.go",
+    package = "dev",
+)
 
 go_library(
     name = "dev",
     srcs = [
         "dev.go",
+        "dev_state.go",
         "device.go",
         "fs.go",
         "full.go",
@@ -16,6 +30,8 @@ go_library(
     visibility = ["//pkg/sentry:internal"],
     deps = [
         "//pkg/abi/linux",
+        "//pkg/amutex",
+        "//pkg/log",
         "//pkg/rand",
         "//pkg/sentry/context",
         "//pkg/sentry/device",
@@ -29,7 +45,9 @@ go_library(
         "//pkg/sentry/mm",
         "//pkg/sentry/platform",
         "//pkg/sentry/safemem",
+        "//pkg/sentry/usage",
         "//pkg/sentry/usermem",
+        "//pkg/state",
         "//pkg/syserror",
     ],
 )
diff --git a/pkg/sentry/fs/dev/dev.go b/pkg/sentry/fs/dev/dev.go
index 3f4f2a40a..36c61bfc2 100644
--- a/pkg/sentry/fs/dev/dev.go
+++ b/pkg/sentry/fs/dev/dev.go
@@ -27,8 +27,6 @@ import (
 )
 
 // Dev is the root node.
-//
-// +stateify savable
 type Dev struct {
 	ramfs.Dir
 }
diff --git a/pkg/sentry/fs/dev/fs.go b/pkg/sentry/fs/dev/fs.go
index 2ae49be4e..3c79f3782 100644
--- a/pkg/sentry/fs/dev/fs.go
+++ b/pkg/sentry/fs/dev/fs.go
@@ -29,8 +29,6 @@ const binderEnabledKey = "binder_enabled"
 const ashmemEnabledKey = "ashmem_enabled"
 
 // filesystem is a devtmpfs.
-//
-// +stateify savable
 type filesystem struct{}
 
 func init() {
diff --git a/pkg/sentry/fs/dev/full.go b/pkg/sentry/fs/dev/full.go
index 492b8eb3a..e13eb6c03 100644
--- a/pkg/sentry/fs/dev/full.go
+++ b/pkg/sentry/fs/dev/full.go
@@ -26,8 +26,6 @@ import (
 )
 
 // fullDevice is used to implement /dev/full.
-//
-// +stateify savable
 type fullDevice struct {
 	ramfs.Entry
 }
diff --git a/pkg/sentry/fs/dev/null.go b/pkg/sentry/fs/dev/null.go
index 2977c8670..66b8ba967 100644
--- a/pkg/sentry/fs/dev/null.go
+++ b/pkg/sentry/fs/dev/null.go
@@ -29,7 +29,6 @@ import (
 	"gvisor.googlesource.com/gvisor/pkg/sentry/usermem"
 )
 
-// +stateify savable
 type nullDevice struct {
 	ramfs.Entry
 }
@@ -55,7 +54,6 @@ func (n *nullDevice) Truncate(context.Context, *fs.Inode, int64) error {
 	return nil
 }
 
-// +stateify savable
 type zeroDevice struct {
 	nullDevice
 }
@@ -82,7 +80,6 @@ func (zd *zeroDevice) GetFile(ctx context.Context, dirent *fs.Dirent, flags fs.F
 	}), nil
 }
 
-// +stateify savable
 type zeroFileOperations struct {
 	fs.FileOperations
 }
diff --git a/pkg/sentry/fs/dev/random.go b/pkg/sentry/fs/dev/random.go
index 47b76218f..33a045a05 100644
--- a/pkg/sentry/fs/dev/random.go
+++ b/pkg/sentry/fs/dev/random.go
@@ -24,7 +24,6 @@ import (
 	"gvisor.googlesource.com/gvisor/pkg/sentry/usermem"
 )
 
-// +stateify savable
 type randomDevice struct {
 	ramfs.Entry
 }
-- 
cgit v1.2.3