From eb09df749abf625cecbd8c83dcdba6b9ddd95fe7 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 5 Aug 2021 18:08:01 -0700 Subject: [PATCH] libct/cg/sd/v1: initPaths: minor optimization As ExpandSlice("system.slice") returns "/system.slice", there is no need to call it for such paths (and the slash will be added by path.Join anyway). The same optimization was already done for v2 as part of commit bf15cc99b1e7b486dfb. Signed-off-by: Kir Kolyshkin --- libcontainer/cgroups/systemd/v1.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libcontainer/cgroups/systemd/v1.go b/libcontainer/cgroups/systemd/v1.go index a871b3b44..470453f33 100644 --- a/libcontainer/cgroups/systemd/v1.go +++ b/libcontainer/cgroups/systemd/v1.go @@ -109,14 +109,13 @@ func (m *legacyManager) initPaths() error { slice := "system.slice" if c.Parent != "" { - slice = c.Parent + var err error + slice, err = ExpandSlice(c.Parent) + if err != nil { + return err + } } - var err error - slice, err = ExpandSlice(slice) - if err != nil { - return err - } unit := getUnitName(c) paths := make(map[string]string)