mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

cgroupv2: UnifiedManager.Apply: simplify

Browse Source 
Remove joinCgroupsV2() function, as its name and second parameter
are misleading. Use createCgroupsv2Path() directly, do not call
getv2Path() twice.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin
2020-03-26 13:57:55 -07:00
parent 5406833a65
commit a949e4f22f
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcontainer/cgroups/systemd/unified_hierarchy.go
+3 -12
View File
@@ -130,14 +130,13 @@ func (m *UnifiedManager) Apply(pid int) error {
return err
}
if err := joinCgroupsV2(c, pid); err != nil {
return err
}
path, err := getv2Path(m.Cgroups)
if err != nil {
return err
}
if err := createCgroupsv2Path(path); err != nil {
return err
}
m.Paths = map[string]string{
"pids": path,
"memory": path,
@@ -239,14 +238,6 @@ func createCgroupsv2Path(path string) (Err error) {
return nil
}
func joinCgroupsV2(c *configs.Cgroup, pid int) error {
path, err := getv2Path(c)
if err != nil {
return err
}
return createCgroupsv2Path(path)
}
func (m *UnifiedManager) fsManager() (cgroups.Manager, error) {
path, err := m.GetUnifiedPath()
if err != nil {