common/pkg/cgroups/systemd_linux.go: Simplified rewrite

lsm5 · lsm5 · commit e0a4dce03aa5 · 2025-11-03T15:59:15.000-05:00
Ref: containers#417 (comment) Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
diff --git a/common/pkg/cgroups/systemd_linux.go b/common/pkg/cgroups/systemd_linux.go
@@ -196,11 +196,10 @@ func resourcesToProps(res *cgroups.Resources) (map[string]uint64, map[string]str
 		uMap["MemoryMax"] = uint64(res.Memory)
 	}
 	if res.MemorySwap != 0 {
-		switch {
-		case res.Memory == -1 || res.MemorySwap == -1:
+		if res.Memory == -1 || res.MemorySwap == -1 {
 			swap := -1
 			uMap["MemorySwapMax"] = uint64(swap)
-		default:
+		} else {
 			// swap max = swap (limit + swap limit) - limit
 			uMap["MemorySwapMax"] = uint64(res.MemorySwap - res.Memory)
 		}

Original file line number	Diff line number	Diff line change
`@@ -196,11 +196,10 @@ func resourcesToProps(res *cgroups.Resources) (map[string]uint64, map[string]str`
`196`	`196`	`uMap["MemoryMax"] = uint64(res.Memory)`
`197`	`197`	`}`
`198`	`198`	`if res.MemorySwap != 0 {`
`199`		`- switch {`
`200`		`- case res.Memory == -1 \|\| res.MemorySwap == -1:`
	`199`	`+ if res.Memory == -1 \|\| res.MemorySwap == -1 {`
`201`	`200`	`swap := -1`
`202`	`201`	`uMap["MemorySwapMax"] = uint64(swap)`
`203`		`- default:`
	`202`	`+ } else {`
`204`	`203`	`// swap max = swap (limit + swap limit) - limit`
`205`	`204`	`uMap["MemorySwapMax"] = uint64(res.MemorySwap - res.Memory)`
`206`	`205`	`}`