summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-03-16 03:15:55 +0000
committergVisor bot <gvisor-bot@google.com>2021-03-16 03:15:55 +0000
commitf2dd5f6a5fa49fc23a131f0545e6373d239aafad (patch)
tree66633fe986fa4135f58c0f61edef0a20a012dfc6
parentd1ae24c94c630caaeec00170de54a67c2efb39d9 (diff)
parentf4b74218202c8f318c603c57aa35895554194d98 (diff)
Merge release-20210309.0-29-gf4b742182 (automated)
-rw-r--r--pkg/iovec/iovec.go3
-rw-r--r--pkg/iovec/iovec_max.go19
2 files changed, 3 insertions, 19 deletions
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