diff --git a/libcontainer/cgroups/utils.go b/libcontainer/cgroups/utils.go index c26be8cd2..05018bd4b 100644 --- a/libcontainer/cgroups/utils.go +++ b/libcontainer/cgroups/utils.go @@ -270,6 +270,7 @@ func RemovePaths(paths map[string]string) (err error) { } } if len(paths) == 0 { + //nolint:ineffassign // done to help garbage collecting: opencontainers/runc#2506 paths = make(map[string]string) return nil } diff --git a/libcontainer/init_linux.go b/libcontainer/init_linux.go index 11dfe17e1..575dd4612 100644 --- a/libcontainer/init_linux.go +++ b/libcontainer/init_linux.go @@ -432,6 +432,7 @@ func setupRlimits(limits []configs.Rlimit, pid int) error { const _P_PID = 1 +//nolint:structcheck,unused type siginfo struct { si_signo int32 si_errno int32 diff --git a/libcontainer/intelrdt/intelrdt.go b/libcontainer/intelrdt/intelrdt.go index 0e5a89bcb..9e1af7aa4 100644 --- a/libcontainer/intelrdt/intelrdt.go +++ b/libcontainer/intelrdt/intelrdt.go @@ -295,11 +295,7 @@ func getIntelRdtRoot() (string, error) { func isIntelRdtMounted() bool { _, err := getIntelRdtRoot() - if err != nil { - return false - } - - return true + return err == nil } type cpuInfoFlags struct {