Automated rollback of changelist 207007153

PiperOrigin-RevId: 207037226
Change-Id: I8b5f1a056d4f3eab17846f2e0193bb737ecb5428

4 files changed, 15 insertions, 16 deletions

diff --git a/pkg/tcpip/transport/unix/BUILD b/pkg/tcpip/transport/unix/BUILD
index dae0bd079..676f2cf92 100644
--- a/pkg/tcpip/transport/unix/BUILD
+++ b/pkg/tcpip/transport/unix/BUILD
@@ -1,6 +1,17 @@
 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 = "unix_state",
+    srcs = [
+        "connectioned.go",
+        "connectionless.go",
+        "unix.go",
+    ],
+    out = "unix_state.go",
+    package = "unix",
+)
 
 go_library(
     name = "unix",
@@ -9,11 +20,14 @@ go_library(
         "connectioned_state.go",
         "connectionless.go",
         "unix.go",
+        "unix_state.go",
     ],
     importpath = "gvisor.googlesource.com/gvisor/pkg/tcpip/transport/unix",
     visibility = ["//:sandbox"],
     deps = [
         "//pkg/ilist",
+        "//pkg/log",
+        "//pkg/state",
         "//pkg/tcpip",
         "//pkg/tcpip/buffer",
         "//pkg/tcpip/transport/queue",
diff --git a/pkg/tcpip/transport/unix/connectioned.go b/pkg/tcpip/transport/unix/connectioned.go
index dd7c03cf1..0e63186b2 100644
--- a/pkg/tcpip/transport/unix/connectioned.go
+++ b/pkg/tcpip/transport/unix/connectioned.go
@@ -85,8 +85,6 @@ type ConnectingEndpoint interface {
 // path != "" && acceptedChan != nil => bound and listening.
 //
 // Only one of these will be true at any moment.
-//
-// +stateify savable
 type connectionedEndpoint struct {
 	baseEndpoint
 
diff --git a/pkg/tcpip/transport/unix/connectionless.go b/pkg/tcpip/transport/unix/connectionless.go
index 2a6ec8b4b..3276ddcd0 100644
--- a/pkg/tcpip/transport/unix/connectionless.go
+++ b/pkg/tcpip/transport/unix/connectionless.go
@@ -25,8 +25,6 @@ import (
 //
 // Specifically, this means datagram unix sockets not created with
 // socketpair(2).
-//
-// +stateify savable
 type connectionlessEndpoint struct {
 	baseEndpoint
 }
diff --git a/pkg/tcpip/transport/unix/unix.go b/pkg/tcpip/transport/unix/unix.go
index 8e4af3139..190a1ccdb 100644
--- a/pkg/tcpip/transport/unix/unix.go
+++ b/pkg/tcpip/transport/unix/unix.go
@@ -60,8 +60,6 @@ type CredentialsControlMessage interface {
 }
 
 // A ControlMessages represents a collection of socket control messages.
-//
-// +stateify savable
 type ControlMessages struct {
 	// Rights is a control message containing FDs.
 	Rights RightsControlMessage
@@ -237,8 +235,6 @@ type BoundEndpoint interface {
 }
 
 // message represents a message passed over a Unix domain socket.
-//
-// +stateify savable
 type message struct {
 	ilist.Entry
 
@@ -310,8 +306,6 @@ type Receiver interface {
 }
 
 // queueReceiver implements Receiver for datagram sockets.
-//
-// +stateify savable
 type queueReceiver struct {
 	readQueue *queue.Queue
 }
@@ -375,8 +369,6 @@ func (q *queueReceiver) RecvMaxQueueSize() int64 {
 func (*queueReceiver) Release() {}
 
 // streamQueueReceiver implements Receiver for stream sockets.
-//
-// +stateify savable
 type streamQueueReceiver struct {
 	queueReceiver
 
@@ -587,7 +579,6 @@ type ConnectedEndpoint interface {
 	Release()
 }
 
-// +stateify savable
 type connectedEndpoint struct {
 	// endpoint represents the subset of the Endpoint functionality needed by
 	// the connectedEndpoint. It is implemented by both connectionedEndpoint
@@ -680,8 +671,6 @@ func (*connectedEndpoint) Release() {}
 // unix domain socket Endpoint implementations.
 //
 // Not to be used on its own.
-//
-// +stateify savable
 type baseEndpoint struct {
 	*waiter.Queue