From fcf210d631b1ade558cd029a26a5d973bea09bb6 Mon Sep 17 00:00:00 2001 From: Ashok Pon Kumar Date: Fri, 2 Oct 2020 00:36:58 +0530 Subject: [PATCH] Fix goreport warnings of ineffassign and misspell Signed-off-by: Ashok Pon Kumar --- libcontainer/cgroups/ebpf/devicefilter/devicefilter.go | 2 +- libcontainer/cgroups/fs/cpuacct.go | 3 +-- libcontainer/specconv/spec_linux.go | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libcontainer/cgroups/ebpf/devicefilter/devicefilter.go b/libcontainer/cgroups/ebpf/devicefilter/devicefilter.go index ac77652a7..c1681a50c 100644 --- a/libcontainer/cgroups/ebpf/devicefilter/devicefilter.go +++ b/libcontainer/cgroups/ebpf/devicefilter/devicefilter.go @@ -1,4 +1,4 @@ -// Package devicefilter containes eBPF device filter program +// Package devicefilter contains eBPF device filter program // // The implementation is based on https://github.com/containers/crun/blob/0.10.2/src/libcrun/ebpf.c // diff --git a/libcontainer/cgroups/fs/cpuacct.go b/libcontainer/cgroups/fs/cpuacct.go index 1a18971bc..7c74b4e91 100644 --- a/libcontainer/cgroups/fs/cpuacct.go +++ b/libcontainer/cgroups/fs/cpuacct.go @@ -83,8 +83,7 @@ func (s *CpuacctGroup) GetStats(path string, stats *cgroups.Stats) error { // Returns user and kernel usage breakdown in nanoseconds. func getCpuUsageBreakdown(path string) (uint64, uint64, error) { - userModeUsage := uint64(0) - kernelModeUsage := uint64(0) + var userModeUsage, kernelModeUsage uint64 const ( userField = "user" systemField = "system" diff --git a/libcontainer/specconv/spec_linux.go b/libcontainer/specconv/spec_linux.go index 3b744f167..97c8fb8bc 100644 --- a/libcontainer/specconv/spec_linux.go +++ b/libcontainer/specconv/spec_linux.go @@ -235,7 +235,6 @@ func CreateLibcontainerConfig(opts *CreateOpts) (*configs.Config, error) { RootlessCgroups: opts.RootlessCgroups, } - exists := false for _, m := range spec.Mounts { config.Mounts = append(config.Mounts, createLibcontainerMount(cwd, m)) } @@ -253,6 +252,7 @@ func CreateLibcontainerConfig(opts *CreateOpts) (*configs.Config, error) { config.Cgroups = c // set linux-specific config if spec.Linux != nil { + var exists bool if config.RootPropagation, exists = mountPropagationMapping[spec.Linux.RootfsPropagation]; !exists { return nil, fmt.Errorf("rootfsPropagation=%v is not supported", spec.Linux.RootfsPropagation) }