From 7d1cb320adf6f1c8994d1688068ce54f5cf000c3 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Tue, 10 Aug 2021 13:10:19 -0700
Subject: [PATCH] libct/cg/fs: rename join to apply

As this is called from the Apply() method, it's a natural name.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 libcontainer/cgroups/fs/blkio.go      | 2 +-
 libcontainer/cgroups/fs/cpuacct.go    | 2 +-
 libcontainer/cgroups/fs/devices.go    | 2 +-
 libcontainer/cgroups/fs/freezer.go    | 2 +-
 libcontainer/cgroups/fs/hugetlb.go    | 2 +-
 libcontainer/cgroups/fs/memory.go     | 2 +-
 libcontainer/cgroups/fs/name.go       | 2 +-
 libcontainer/cgroups/fs/net_cls.go    | 2 +-
 libcontainer/cgroups/fs/net_prio.go   | 2 +-
 libcontainer/cgroups/fs/paths.go      | 2 +-
 libcontainer/cgroups/fs/perf_event.go | 2 +-
 libcontainer/cgroups/fs/pids.go       | 2 +-
 libcontainer/cgroups/fs/rdma.go       | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/libcontainer/cgroups/fs/blkio.go b/libcontainer/cgroups/fs/blkio.go
index 2d764001e..14b572cfe 100644
--- a/libcontainer/cgroups/fs/blkio.go
+++ b/libcontainer/cgroups/fs/blkio.go
@@ -21,7 +21,7 @@ func (s *BlkioGroup) Name() string {
 }
 
 func (s *BlkioGroup) Apply(path string, d *cgroupData) error {
-	return join(path, d.pid)
+	return apply(path, d.pid)
 }
 
 func (s *BlkioGroup) Set(path string, r *configs.Resources) error {
diff --git a/libcontainer/cgroups/fs/cpuacct.go b/libcontainer/cgroups/fs/cpuacct.go
index 076704ab7..537bada66 100644
--- a/libcontainer/cgroups/fs/cpuacct.go
+++ b/libcontainer/cgroups/fs/cpuacct.go
@@ -35,7 +35,7 @@ func (s *CpuacctGroup) Name() string {
 }
 
 func (s *CpuacctGroup) Apply(path string, d *cgroupData) error {
-	return join(path, d.pid)
+	return apply(path, d.pid)
 }
 
 func (s *CpuacctGroup) Set(_ string, _ *configs.Resources) error {
diff --git a/libcontainer/cgroups/fs/devices.go b/libcontainer/cgroups/fs/devices.go
index 2c8917049..20a11e8c6 100644
--- a/libcontainer/cgroups/fs/devices.go
+++ b/libcontainer/cgroups/fs/devices.go
@@ -29,7 +29,7 @@ func (s *DevicesGroup) Apply(path string, d *cgroupData) error {
 		// is a hard requirement for container's security.
 		return errSubsystemDoesNotExist
 	}
-	return join(path, d.pid)
+	return apply(path, d.pid)
 }
 
 func loadEmulator(path string) (*cgroupdevices.Emulator, error) {
diff --git a/libcontainer/cgroups/fs/freezer.go b/libcontainer/cgroups/fs/freezer.go
index cf1c5efb0..1dc4dd9fc 100644
--- a/libcontainer/cgroups/fs/freezer.go
+++ b/libcontainer/cgroups/fs/freezer.go
@@ -20,7 +20,7 @@ func (s *FreezerGroup) Name() string {
 }
 
 func (s *FreezerGroup) Apply(path string, d *cgroupData) error {
-	return join(path, d.pid)
+	return apply(path, d.pid)
 }
 
 func (s *FreezerGroup) Set(path string, r *configs.Resources) (Err error) {
diff --git a/libcontainer/cgroups/fs/hugetlb.go b/libcontainer/cgroups/fs/hugetlb.go
index 8477fa6b3..f95e3be25 100644
--- a/libcontainer/cgroups/fs/hugetlb.go
+++ b/libcontainer/cgroups/fs/hugetlb.go
@@ -15,7 +15,7 @@ func (s *HugetlbGroup) Name() string {
 }
 
 func (s *HugetlbGroup) Apply(path string, d *cgroupData) error {
-	return join(path, d.pid)
+	return apply(path, d.pid)
 }
 
 func (s *HugetlbGroup) Set(path string, r *configs.Resources) error {
diff --git a/libcontainer/cgroups/fs/memory.go b/libcontainer/cgroups/fs/memory.go
index 8e10c22b2..a349ad4b6 100644
--- a/libcontainer/cgroups/fs/memory.go
+++ b/libcontainer/cgroups/fs/memory.go
@@ -31,7 +31,7 @@ func (s *MemoryGroup) Name() string {
 }
 
 func (s *MemoryGroup) Apply(path string, d *cgroupData) (err error) {
-	return join(path, d.pid)
+	return apply(path, d.pid)
 }
 
 func setMemory(path string, val int64) error {
diff --git a/libcontainer/cgroups/fs/name.go b/libcontainer/cgroups/fs/name.go
index ce9f4a0a5..056bf825d 100644
--- a/libcontainer/cgroups/fs/name.go
+++ b/libcontainer/cgroups/fs/name.go
@@ -17,7 +17,7 @@ func (s *NameGroup) Name() string {
 func (s *NameGroup) Apply(path string, d *cgroupData) error {
 	if s.Join {
 		// ignore errors if the named cgroup does not exist
-		_ = join(path, d.pid)
+		_ = apply(path, d.pid)
 	}
 	return nil
 }
diff --git a/libcontainer/cgroups/fs/net_cls.go b/libcontainer/cgroups/fs/net_cls.go
index d13642926..ef9514fb8 100644
--- a/libcontainer/cgroups/fs/net_cls.go
+++ b/libcontainer/cgroups/fs/net_cls.go
@@ -14,7 +14,7 @@ func (s *NetClsGroup) Name() string {
 }
 
 func (s *NetClsGroup) Apply(path string, d *cgroupData) error {
-	return join(path, d.pid)
+	return apply(path, d.pid)
 }
 
 func (s *NetClsGroup) Set(path string, r *configs.Resources) error {
diff --git a/libcontainer/cgroups/fs/net_prio.go b/libcontainer/cgroups/fs/net_prio.go
index cdc810bae..38c26989a 100644
--- a/libcontainer/cgroups/fs/net_prio.go
+++ b/libcontainer/cgroups/fs/net_prio.go
@@ -12,7 +12,7 @@ func (s *NetPrioGroup) Name() string {
 }
 
 func (s *NetPrioGroup) Apply(path string, d *cgroupData) error {
-	return join(path, d.pid)
+	return apply(path, d.pid)
 }
 
 func (s *NetPrioGroup) Set(path string, r *configs.Resources) error {
diff --git a/libcontainer/cgroups/fs/paths.go b/libcontainer/cgroups/fs/paths.go
index 671353ac8..9556f8b4c 100644
--- a/libcontainer/cgroups/fs/paths.go
+++ b/libcontainer/cgroups/fs/paths.go
@@ -162,7 +162,7 @@ func (raw *cgroupData) path(subsystem string) (string, error) {
 	return filepath.Join(parentPath, raw.innerPath), nil
 }
 
-func join(path string, pid int) error {
+func apply(path string, pid int) error {
 	if path == "" {
 		return nil
 	}
diff --git a/libcontainer/cgroups/fs/perf_event.go b/libcontainer/cgroups/fs/perf_event.go
index 8ffa83e09..486c7fe45 100644
--- a/libcontainer/cgroups/fs/perf_event.go
+++ b/libcontainer/cgroups/fs/perf_event.go
@@ -12,7 +12,7 @@ func (s *PerfEventGroup) Name() string {
 }
 
 func (s *PerfEventGroup) Apply(path string, d *cgroupData) error {
-	return join(path, d.pid)
+	return apply(path, d.pid)
 }
 
 func (s *PerfEventGroup) Set(_ string, _ *configs.Resources) error {
diff --git a/libcontainer/cgroups/fs/pids.go b/libcontainer/cgroups/fs/pids.go
index 55bb91fa6..33bb64c9b 100644
--- a/libcontainer/cgroups/fs/pids.go
+++ b/libcontainer/cgroups/fs/pids.go
@@ -16,7 +16,7 @@ func (s *PidsGroup) Name() string {
 }
 
 func (s *PidsGroup) Apply(path string, d *cgroupData) error {
-	return join(path, d.pid)
+	return apply(path, d.pid)
 }
 
 func (s *PidsGroup) Set(path string, r *configs.Resources) error {
diff --git a/libcontainer/cgroups/fs/rdma.go b/libcontainer/cgroups/fs/rdma.go
index 5fb25abe7..3548db3b6 100644
--- a/libcontainer/cgroups/fs/rdma.go
+++ b/libcontainer/cgroups/fs/rdma.go
@@ -13,7 +13,7 @@ func (s *RdmaGroup) Name() string {
 }
 
 func (s *RdmaGroup) Apply(path string, d *cgroupData) error {
-	return join(path, d.pid)
+	return apply(path, d.pid)
 }
 
 func (s *RdmaGroup) Set(path string, r *configs.Resources) error {