From a77d7b1d0f60d644eed13afc486a2c72e5448433 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Mon, 15 Jun 2020 18:21:01 -0700
Subject: [PATCH] libct: don't use GetPaths

Since commit 714c91e9f73a151280, method GetPaths() should only be used
for saving container state. For other uses, we have a new method,
Path(), which is cleaner.

Fix GetPaths() usage introduced by recent commits 859a780d6f3 and 9087f2e82.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 libcontainer/cgroups/fs/apply_raw.go | 5 ++---
 libcontainer/container_linux_test.go | 8 ++------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/libcontainer/cgroups/fs/apply_raw.go b/libcontainer/cgroups/fs/apply_raw.go
index 5ccf4000d..16aed8cdc 100644
--- a/libcontainer/cgroups/fs/apply_raw.go
+++ b/libcontainer/cgroups/fs/apply_raw.go
@@ -264,7 +264,7 @@ func (m *manager) Set(container *configs.Config) error {
 // Freeze toggles the container's freezer cgroup depending on the state
 // provided
 func (m *manager) Freeze(state configs.FreezerState) (Err error) {
-	path := m.GetPaths()["freezer"]
+	path := m.Path("freezer")
 	if m.cgroups == nil || path == "" {
 		return errors.New("cannot toggle freezer: cgroups not configured for container")
 	}
@@ -382,8 +382,7 @@ func (m *manager) GetCgroups() (*configs.Cgroup, error) {
 }
 
 func (m *manager) GetFreezerState() (configs.FreezerState, error) {
-	paths := m.GetPaths()
-	dir := paths["freezer"]
+	dir := m.Path("freezer")
 	freezer, err := m.getSubsystems().Get("freezer")
 
 	// If the container doesn't have the freezer cgroup, say it's undefined.
diff --git a/libcontainer/container_linux_test.go b/libcontainer/container_linux_test.go
index 187517330..72ca1ef72 100644
--- a/libcontainer/container_linux_test.go
+++ b/libcontainer/container_linux_test.go
@@ -51,12 +51,8 @@ func (m *mockCgroupManager) Destroy() error {
 }
 
 func (m *mockCgroupManager) Exists() bool {
-	paths := m.GetPaths()
-	if paths != nil {
-		_, err := os.Lstat(paths["devices"])
-		return err == nil
-	}
-	return false
+	_, err := os.Lstat(m.Path("devices"))
+	return err == nil
 }
 
 func (m *mockCgroupManager) GetPaths() map[string]string {