jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #162 from kolyshkin/mkdirall 

Simplify and fix os.MkdirAll() usage
This commit is contained in:
Alexander Morozov 2015-07-29 19:43:34 -07:00
parent b40c790184 6f82d4b544
commit 45cbce3e45
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcontainer/cgroups/fs/apply_raw.go
View File

@ -272,7 +272,7 @@ func (raw *data) join(subsystem string) (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) { if err := os.MkdirAll(path, 0755); err != nil {
return "", err return "", err
} }
if err := writeFile(path, CgroupProcesses, strconv.Itoa(raw.pid)); err != nil { if err := writeFile(path, CgroupProcesses, strconv.Itoa(raw.pid)); err != nil {

2
libcontainer/cgroups/fs/cpuset.go
View File

@ -95,7 +95,7 @@ func (s *CpusetGroup) ensureParent(current, root string) error {
if err := s.ensureParent(parent, root); err != nil { if err := s.ensureParent(parent, root); err != nil {
return err return err
} }
if err := os.MkdirAll(current, 0755); err != nil && !os.IsExist(err) { if err := os.MkdirAll(current, 0755); err != nil {
return err return err
} }
return s.copyIfNeeded(current, parent) return s.copyIfNeeded(current, parent)

2
libcontainer/cgroups/fs/memory.go
View File

@ -25,7 +25,7 @@ func (s *MemoryGroup) Apply(d *data) error {
} }
return err return err
} }
if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) { if err := os.MkdirAll(path, 0755); err != nil {
return err return err
} }
if err := s.Set(path, d.c); err != nil { if err := s.Set(path, d.c); err != nil {

4
libcontainer/cgroups/systemd/apply_systemd.go
View File

@ -298,7 +298,7 @@ func join(c *configs.Cgroup, subsystem string, pid int) (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) { if err := os.MkdirAll(path, 0755); err != nil {
return "", err return "", err
} }
if err := writeFile(path, "cgroup.procs", strconv.Itoa(pid)); err != nil { if err := writeFile(path, "cgroup.procs", strconv.Itoa(pid)); err != nil {
@ -478,7 +478,7 @@ func setKernelMemory(c *configs.Cgroup) error {
return err return err
} }
if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) { if err := os.MkdirAll(path, 0755); err != nil {
return err return err
} }

8
libcontainer/rootfs_linux.go
View File

@ -98,12 +98,12 @@ func mountToRootfs(m *configs.Mount, rootfs, mountLabel string) error {
switch m.Device { switch m.Device {
case "proc", "sysfs": 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 err
} }
return syscall.Mount(m.Source, dest, m.Device, uintptr(m.Flags), "") return syscall.Mount(m.Source, dest, m.Device, uintptr(m.Flags), "")
case "mqueue": case "mqueue":
if err := os.MkdirAll(dest, 0755); err != nil && !os.IsExist(err) { if err := os.MkdirAll(dest, 0755); err != nil {
return err return err
} }
if err := syscall.Mount(m.Source, dest, m.Device, uintptr(m.Flags), ""); err != nil { 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": case "tmpfs":
stat, err := os.Stat(dest) stat, err := os.Stat(dest)
if err != nil { if err != nil {
if err := os.MkdirAll(dest, 0755); err != nil && !os.IsExist(err) { if err := os.MkdirAll(dest, 0755); err != nil {
return err return err
} }
} }
@ -127,7 +127,7 @@ func mountToRootfs(m *configs.Mount, rootfs, mountLabel string) error {
} }
return nil return nil
case "devpts": case "devpts":
if err := os.MkdirAll(dest, 0755); err != nil && !os.IsExist(err) { if err := os.MkdirAll(dest, 0755); err != nil {
return err return err
} }
return syscall.Mount(m.Source, dest, m.Device, uintptr(m.Flags), data) return syscall.Mount(m.Source, dest, m.Device, uintptr(m.Flags), data)