diff --git a/libcontainer/cgroups/fs/apply_raw.go b/libcontainer/cgroups/fs/apply_raw.go index c8ea761d..f75dab1b 100644 --- a/libcontainer/cgroups/fs/apply_raw.go +++ b/libcontainer/cgroups/fs/apply_raw.go @@ -272,7 +272,7 @@ func (raw *data) join(subsystem string) (string, error) { if err != nil { return "", err } - if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) { + if err := os.MkdirAll(path, 0755); err != nil { return "", err } if err := writeFile(path, CgroupProcesses, strconv.Itoa(raw.pid)); err != nil { diff --git a/libcontainer/cgroups/fs/cpuset.go b/libcontainer/cgroups/fs/cpuset.go index b6c04b0c..f3ec2c3e 100644 --- a/libcontainer/cgroups/fs/cpuset.go +++ b/libcontainer/cgroups/fs/cpuset.go @@ -95,7 +95,7 @@ func (s *CpusetGroup) ensureParent(current, root string) error { if err := s.ensureParent(parent, root); err != nil { return err } - if err := os.MkdirAll(current, 0755); err != nil && !os.IsExist(err) { + if err := os.MkdirAll(current, 0755); err != nil { return err } return s.copyIfNeeded(current, parent) diff --git a/libcontainer/cgroups/fs/memory.go b/libcontainer/cgroups/fs/memory.go index 8206b147..1fa8bd74 100644 --- a/libcontainer/cgroups/fs/memory.go +++ b/libcontainer/cgroups/fs/memory.go @@ -25,7 +25,7 @@ func (s *MemoryGroup) Apply(d *data) error { } return err } - if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) { + if err := os.MkdirAll(path, 0755); err != nil { return err } if err := s.Set(path, d.c); err != nil { diff --git a/libcontainer/cgroups/systemd/apply_systemd.go b/libcontainer/cgroups/systemd/apply_systemd.go index 8c27f11a..1472ba32 100644 --- a/libcontainer/cgroups/systemd/apply_systemd.go +++ b/libcontainer/cgroups/systemd/apply_systemd.go @@ -298,7 +298,7 @@ func join(c *configs.Cgroup, subsystem string, pid int) (string, error) { if err != nil { return "", err } - if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) { + if err := os.MkdirAll(path, 0755); err != nil { return "", err } if err := writeFile(path, "cgroup.procs", strconv.Itoa(pid)); err != nil { @@ -478,7 +478,7 @@ func setKernelMemory(c *configs.Cgroup) error { return err } - if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) { + if err := os.MkdirAll(path, 0755); err != nil { return err } diff --git a/libcontainer/rootfs_linux.go b/libcontainer/rootfs_linux.go index 78e51224..88aa77d5 100644 --- a/libcontainer/rootfs_linux.go +++ b/libcontainer/rootfs_linux.go @@ -98,12 +98,12 @@ func mountToRootfs(m *configs.Mount, rootfs, mountLabel string) error { switch m.Device { case "proc", "sysfs": - if err := os.MkdirAll(dest, 0755); err != nil && !os.IsExist(err) { + if err := os.MkdirAll(dest, 0755); err != nil { return err } return syscall.Mount(m.Source, dest, m.Device, uintptr(m.Flags), "") case "mqueue": - if err := os.MkdirAll(dest, 0755); err != nil && !os.IsExist(err) { + if err := os.MkdirAll(dest, 0755); err != nil { return err } if err := syscall.Mount(m.Source, dest, m.Device, uintptr(m.Flags), ""); err != nil { @@ -113,7 +113,7 @@ func mountToRootfs(m *configs.Mount, rootfs, mountLabel string) error { case "tmpfs": stat, err := os.Stat(dest) if err != nil { - if err := os.MkdirAll(dest, 0755); err != nil && !os.IsExist(err) { + if err := os.MkdirAll(dest, 0755); err != nil { return err } } @@ -127,7 +127,7 @@ func mountToRootfs(m *configs.Mount, rootfs, mountLabel string) error { } return nil case "devpts": - if err := os.MkdirAll(dest, 0755); err != nil && !os.IsExist(err) { + if err := os.MkdirAll(dest, 0755); err != nil { return err } return syscall.Mount(m.Source, dest, m.Device, uintptr(m.Flags), data)