From 0fb1fb1ce0177cf31dd96e9fdb4a5f55155a5966 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Mon, 24 Jul 2017 10:16:38 -0700 Subject: [PATCH] Use container.HostConfig.ShmSize directly It was noted[1] that container's HostConfig.ShmSize, if not set, should be initialized to daemon default value during container creation. In fact, it is already done in daemon.adaptContainerSettings, so we can use value from container.HostConfig directly. [1] https://github.com/moby/moby/pull/34087#discussion_r128656429 Signed-off-by: Kir Kolyshkin --- daemon/container_operations_unix.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/daemon/container_operations_unix.go b/daemon/container_operations_unix.go index fe635b22bb..a98a368640 100644 --- a/daemon/container_operations_unix.go +++ b/daemon/container_operations_unix.go @@ -120,11 +120,7 @@ func (daemon *Daemon) setupIpcDirs(c *container.Container) error { return err } - shmSize := int64(daemon.configStore.ShmSize) - if c.HostConfig.ShmSize != 0 { - shmSize = c.HostConfig.ShmSize - } - shmproperty := "mode=1777,size=" + strconv.FormatInt(shmSize, 10) + shmproperty := "mode=1777,size=" + strconv.FormatInt(c.HostConfig.ShmSize, 10) if err := unix.Mount("shm", shmPath, "tmpfs", uintptr(unix.MS_NOEXEC|unix.MS_NOSUID|unix.MS_NODEV), label.FormatMountLabel(shmproperty, c.GetMountLabel())); err != nil { return fmt.Errorf("mounting shm tmpfs: %s", err) }