summaryrefslogtreecommitdiffhomepage
path: root/runsc/specutils
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-05-28 19:28:28 +0000
committergVisor bot <gvisor-bot@google.com>2020-05-28 19:28:28 +0000
commit3f6e6c2d4236127b5db2264f738bbfc08e218431 (patch)
tree3bcbe124876d8b6bc96cf03780624275a448e9ab /runsc/specutils
parentc6ac1abc16b544644cdced8e4514fb79636195ce (diff)
parenta8c1b326600983abeabd41cbfa0c32ff84cf475a (diff)
Merge release-20200522.0-21-ga8c1b326 (automated)
Diffstat (limited to 'runsc/specutils')
-rw-r--r--runsc/specutils/specutils.go14
1 files changed, 1 insertions, 13 deletions
diff --git a/runsc/specutils/specutils.go b/runsc/specutils/specutils.go
index 202518b58..837d5e238 100644
--- a/runsc/specutils/specutils.go
+++ b/runsc/specutils/specutils.go
@@ -311,19 +311,7 @@ func capsFromNames(names []string, skipSet map[linux.Capability]struct{}) (auth.
// Is9PMount returns true if the given mount can be mounted as an external gofer.
func Is9PMount(m specs.Mount) bool {
- var isBind bool
- switch m.Type {
- case "bind":
- isBind = true
- default:
- for _, opt := range m.Options {
- if opt == "bind" || opt == "rbind" {
- isBind = true
- break
- }
- }
- }
- return isBind && m.Source != "" && IsSupportedDevMount(m)
+ return m.Type == "bind" && m.Source != "" && IsSupportedDevMount(m)
}
// IsSupportedDevMount returns true if the mount is a supported /dev mount.