summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEtienne Perot <eperot@google.com>2021-03-15 20:09:37 -0700
committergVisor bot <gvisor-bot@google.com>2021-03-15 20:11:41 -0700
commitf4b74218202c8f318c603c57aa35895554194d98 (patch)
treee85cfa1e94c96ba14bd1629de229078a72f76ea9
parent34d0d720679778611fce51ed7f62fbdafa413d60 (diff)
Move `MaxIovs` back to a variable in `iovec.go`.
PiperOrigin-RevId: 363091954
-rw-r--r--pkg/iovec/BUILD5
-rw-r--r--pkg/iovec/iovec.go3
-rw-r--r--pkg/iovec/iovec_max.go19
3 files changed, 4 insertions, 23 deletions
diff --git a/pkg/iovec/BUILD b/pkg/iovec/BUILD
index e0c016fa3..f4e9a6af9 100644
--- a/pkg/iovec/BUILD
+++ b/pkg/iovec/BUILD
@@ -4,10 +4,7 @@ package(licenses = ["notice"])
go_library(
name = "iovec",
- srcs = [
- "iovec.go",
- "iovec_max.go",
- ],
+ srcs = ["iovec.go"],
visibility = ["//:sandbox"],
deps = ["@org_golang_x_sys//unix:go_default_library"],
)
diff --git a/pkg/iovec/iovec.go b/pkg/iovec/iovec.go
index f6791060f..a281c05b6 100644
--- a/pkg/iovec/iovec.go
+++ b/pkg/iovec/iovec.go
@@ -22,6 +22,9 @@ import (
"golang.org/x/sys/unix"
)
+// MaxIovs is the maximum number of iovecs host platform can accept.
+var MaxIovs = 1024
+
// Builder is a builder for slice of unix.Iovec.
type Builder struct {
iovec []unix.Iovec
diff --git a/pkg/iovec/iovec_max.go b/pkg/iovec/iovec_max.go
deleted file mode 100644
index 724b256e8..000000000
--- a/pkg/iovec/iovec_max.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2021 The gVisor Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package iovec
-
-// MaxIovs is the maximum number of iovecs host platform can accept. It
-// corresponds to Linux's UIO_MAXIOV, which is not in the unix package.
-const MaxIovs = 1024