Merge pull request #1955 from xiaochenshen/rdt-fix-destroy-issue

Mrunal Patel · web-flow · commit e4fa8a457544 · 2019-02-01T13:18:56.000-08:00
libcontainer: intelrdt: fix null intelrdt path issue in Destroy()
diff --git a/libcontainer/intelrdt/intelrdt.go b/libcontainer/intelrdt/intelrdt.go
@@ -547,7 +547,7 @@ func (m *IntelRdtManager) Apply(pid int) (err error) {
 func (m *IntelRdtManager) Destroy() error {
 	m.mu.Lock()
 	defer m.mu.Unlock()
-	if err := os.RemoveAll(m.Path); err != nil {
+	if err := os.RemoveAll(m.GetPath()); err != nil {
 		return err
 	}
 	m.Path = ""

Original file line number	Diff line number	Diff line change
`@@ -547,7 +547,7 @@ func (m *IntelRdtManager) Apply(pid int) (err error) {`
`547`	`547`	`func (m *IntelRdtManager) Destroy() error {`
`548`	`548`	`m.mu.Lock()`
`549`	`549`	`defer m.mu.Unlock()`
`550`		`- if err := os.RemoveAll(m.Path); err != nil {`
	`550`	`+ if err := os.RemoveAll(m.GetPath()); err != nil {`
`551`	`551`	`return err`
`552`	`552`	`}`
`553`	`553`	`m.Path = ""`