From fefc1d37145b8c322d1c33d4c22ab19dff8e89bd Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Tue, 12 Sep 2023 16:35:40 -0400 Subject: [PATCH] libcontainer: remove isPidsSet because it should always be set Signed-off-by: Peter Hunt --- libcontainer/cgroups/fs2/create.go | 2 +- libcontainer/cgroups/fs2/pids.go | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/libcontainer/cgroups/fs2/create.go b/libcontainer/cgroups/fs2/create.go index 641123a4d84..94041c4c94a 100644 --- a/libcontainer/cgroups/fs2/create.go +++ b/libcontainer/cgroups/fs2/create.go @@ -39,7 +39,7 @@ func needAnyControllers(r *configs.Resources) (bool, error) { return ok } - if isPidsSet(r) && have("pids") { + if have("pids") { return true, nil } if isMemorySet(r) && have("memory") { diff --git a/libcontainer/cgroups/fs2/pids.go b/libcontainer/cgroups/fs2/pids.go index fee3dc8cecf..71801002373 100644 --- a/libcontainer/cgroups/fs2/pids.go +++ b/libcontainer/cgroups/fs2/pids.go @@ -13,10 +13,6 @@ import ( "github.com/opencontainers/runc/libcontainer/configs" ) -func isPidsSet(r *configs.Resources) bool { - return r.PidsLimit != 0 -} - func setPids(dirPath string, r *configs.Resources) error { if val := numToStr(r.PidsLimit); val != "" { if err := cgroups.WriteFile(dirPath, "pids.max", val); err != nil {