Skip to content

Commit 89c46a9

Browse files
authored
Merge pull request #4840 from marquiz/devel/rdt-mkdir-rmdir
libcontainer/intelrdt: use Mkdir/Remove instead of MkdirAll/RemoveAll
2 parents 851e100 + 620956c commit 89c46a9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

libcontainer/intelrdt/intelrdt.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ func (m *Manager) Apply(pid int) (err error) {
472472
}
473473
}
474474

475-
if err := os.MkdirAll(path, 0o755); err != nil {
475+
if err := os.Mkdir(path, 0o755); err != nil && !os.IsExist(err) {
476476
return newLastCmdError(err)
477477
}
478478

@@ -492,7 +492,7 @@ func (m *Manager) Destroy() error {
492492
if m.config.IntelRdt != nil && m.config.IntelRdt.ClosID == "" {
493493
m.mu.Lock()
494494
defer m.mu.Unlock()
495-
if err := os.RemoveAll(m.GetPath()); err != nil {
495+
if err := os.Remove(m.GetPath()); err != nil && !os.IsNotExist(err) {
496496
return err
497497
}
498498
m.path = ""

0 commit comments

Comments
 (0)