Merge pull request opencontainers#2628 from thaJeztah/linting_foo

fix some linting issues
kolyshkin · Oct 6, 2020 · bb539a9 · bb539a9
2 parents 0a9af39 + e8eb800
commit bb539a9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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 {