Merge pull request #5064 from Iceber/fix-redundant-slice

mxpv · web-flow · commit 46c9746507b7 · 2021-02-26T09:44:50.000-08:00
oci: fix superfluous slice operations
diff --git a/oci/spec_opts.go b/oci/spec_opts.go
@@ -294,10 +294,7 @@ func WithLinuxNamespace(ns specs.LinuxNamespace) SpecOpts {
 		setLinux(s)
 		for i, n := range s.Linux.Namespaces {
 			if n.Type == ns.Type {
-				before := s.Linux.Namespaces[:i]
-				after := s.Linux.Namespaces[i+1:]
-				s.Linux.Namespaces = append(before, ns)
-				s.Linux.Namespaces = append(s.Linux.Namespaces, after...)
+				s.Linux.Namespaces[i] = ns
 				return nil
 			}
 		}
@@ -930,33 +927,27 @@ func WithReadonlyPaths(paths []string) SpecOpts {
 
 // WithWriteableSysfs makes any sysfs mounts writeable
 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" {
-			var options []string
-			for _, o := range m.Options {
+			for i, o := range m.Options {
 				if o == "ro" {
-					o = "rw"
+					m.Options[i] = "rw"
 				}
-				options = append(options, o)
 			}
-			s.Mounts[i].Options = options
 		}
 	}
 	return nil
 }
 
 // WithWriteableCgroupfs makes any cgroup mounts writeable
 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" {
-			var options []string
-			for _, o := range m.Options {
+			for i, o := range m.Options {
 				if o == "ro" {
-					o = "rw"
+					m.Options[i] = "rw"
 				}
-				options = append(options, o)
 			}
-			s.Mounts[i].Options = options
 		}
 	}
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -294,10 +294,7 @@ func WithLinuxNamespace(ns specs.LinuxNamespace) SpecOpts {`
`294`	`294`	`setLinux(s)`
`295`	`295`	`for i, n := range s.Linux.Namespaces {`
`296`	`296`	`if n.Type == ns.Type {`
`297`		`- before := s.Linux.Namespaces[:i]`
`298`		`- after := s.Linux.Namespaces[i+1:]`
`299`		`- s.Linux.Namespaces = append(before, ns)`
`300`		`- s.Linux.Namespaces = append(s.Linux.Namespaces, after...)`
	`297`	`+ s.Linux.Namespaces[i] = ns`
`301`	`298`	`return nil`
`302`	`299`	`}`
`303`	`300`	`}`
`@@ -930,33 +927,27 @@ func WithReadonlyPaths(paths []string) SpecOpts {`
`930`	`927`
`931`	`928`	`// WithWriteableSysfs makes any sysfs mounts writeable`
`932`	`929`	`func WithWriteableSysfs(_ context.Context, _ Client, _ containers.Container, s Spec) error {`
`933`		`- for i, m := range s.Mounts {`
	`930`	`+ for _, m := range s.Mounts {`
`934`	`931`	`if m.Type == "sysfs" {`
`935`		`- var options []string`
`936`		`- for _, o := range m.Options {`
	`932`	`+ for i, o := range m.Options {`
`937`	`933`	`if o == "ro" {`
`938`		`- o = "rw"`
	`934`	`+ m.Options[i] = "rw"`
`939`	`935`	`}`
`940`		`- options = append(options, o)`
`941`	`936`	`}`
`942`		`- s.Mounts[i].Options = options`
`943`	`937`	`}`
`944`	`938`	`}`
`945`	`939`	`return nil`
`946`	`940`	`}`
`947`	`941`
`948`	`942`	`// WithWriteableCgroupfs makes any cgroup mounts writeable`
`949`	`943`	`func WithWriteableCgroupfs(_ context.Context, _ Client, _ containers.Container, s Spec) error {`
`950`		`- for i, m := range s.Mounts {`
	`944`	`+ for _, m := range s.Mounts {`
`951`	`945`	`if m.Type == "cgroup" {`
`952`		`- var options []string`
`953`		`- for _, o := range m.Options {`
	`946`	`+ for i, o := range m.Options {`
`954`	`947`	`if o == "ro" {`
`955`		`- o = "rw"`
	`948`	`+ m.Options[i] = "rw"`
`956`	`949`	`}`
`957`		`- options = append(options, o)`
`958`	`950`	`}`
`959`		`- s.Mounts[i].Options = options`
`960`	`951`	`}`
`961`	`952`	`}`
`962`	`953`	`return nil`