Sfoglia il codice sorgente

daemon.setMounts(): copy slice in place

It does not make sense to copy a slice element by element, then discard
the source one. Let's do copy in place instead which is way more
efficient.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Kir Kolyshkin 8 anni fa
parent
commit
d4c94e83ca
1 ha cambiato i file con 1 aggiunte e 1 eliminazioni
  1. 1 1
      daemon/oci_linux.go

+ 1 - 1
daemon/oci_linux.go

@@ -533,7 +533,7 @@ func setMounts(daemon *Daemon, s *specs.Spec, c *container.Container, mounts []c
 	//  - /dev/shm, in case IpcMode is none.
 	//  - /dev/shm, in case IpcMode is none.
 	// While at it, also
 	// While at it, also
 	//  - set size for /dev/shm from shmsize.
 	//  - set size for /dev/shm from shmsize.
-	var defaultMounts []specs.Mount
+	defaultMounts := s.Mounts[:0]
 	_, mountDev := userMounts["/dev"]
 	_, mountDev := userMounts["/dev"]
 	for _, m := range s.Mounts {
 	for _, m := range s.Mounts {
 		if _, ok := userMounts[m.Destination]; ok {
 		if _, ok := userMounts[m.Destination]; ok {