github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

oci: fix superfluous slice operations

Browse Source 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
This commit is contained in:
Iceber Gu 2021-02-23 14:26:37 +08:00
parent 2bc8c779c5
commit f7f6aabfff
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
oci/spec_opts.go
View File

@ -294,10 +294,7 @@ func WithLinuxNamespace(ns specs.LinuxNamespace) SpecOpts {
setLinux(s) setLinux(s)
for i, n := range s.Linux.Namespaces { for i, n := range s.Linux.Namespaces {
if n.Type == ns.Type { if n.Type == ns.Type {
before := s.Linux.Namespaces[:i] s.Linux.Namespaces[i] = ns
after := s.Linux.Namespaces[i+1:]
s.Linux.Namespaces = append(before, ns)
s.Linux.Namespaces = append(s.Linux.Namespaces, after...)
return nil return nil
} }
} }
@ -930,16 +927,13 @@ func WithReadonlyPaths(paths []string) SpecOpts {
// WithWriteableSysfs makes any sysfs mounts writeable // WithWriteableSysfs makes any sysfs mounts writeable
func WithWriteableSysfs(_ context.Context, _ Client, _ *containers.Container, s *Spec) error { func WithWriteableSysfs(_ context.Context, _ Client, _ *containers.Container, s *Spec) error {
for i, m := range s.Mounts { for _, m := range s.Mounts {
if m.Type == "sysfs" { if m.Type == "sysfs" {
var options []string for i, o := range m.Options {
for _, o := range m.Options {
if o == "ro" { if o == "ro" {
o = "rw" m.Options[i] = "rw"
} }
options = append(options, o)
} }
s.Mounts[i].Options = options
} }
} }
return nil return nil
@ -947,16 +941,13 @@ func WithWriteableSysfs(_ context.Context, _ Client, _ *containers.Container, s
// WithWriteableCgroupfs makes any cgroup mounts writeable // WithWriteableCgroupfs makes any cgroup mounts writeable
func WithWriteableCgroupfs(_ context.Context, _ Client, _ *containers.Container, s *Spec) error { func WithWriteableCgroupfs(_ context.Context, _ Client, _ *containers.Container, s *Spec) error {
for i, m := range s.Mounts { for _, m := range s.Mounts {
if m.Type == "cgroup" { if m.Type == "cgroup" {
var options []string for i, o := range m.Options {
for _, o := range m.Options {
if o == "ro" { if o == "ro" {
o = "rw" m.Options[i] = "rw"
} }
options = append(options, o)
} }
s.Mounts[i].Options = options
} }
} }
return nil return nil