libcontainer: remove isPidsSet because it should always be set

haircommander · haircommander · commit fefc1d37145b · 2023-09-12T16:35:40.000-04:00
Signed-off-by: Peter Hunt &lt;pehunt@redhat.com&gt;
diff --git 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
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ func needAnyControllers(r *configs.Resources) (bool, error) {`
`39`	`39`	`return ok`
`40`	`40`	`}`
`41`	`41`
`42`		`- if isPidsSet(r) && have("pids") {`
	`42`	`+ if have("pids") {`
`43`	`43`	`return true, nil`
`44`	`44`	`}`
`45`	`45`	`if isMemorySet(r) && have("memory") {`