diff --git a/.golangci.yml b/.golangci.yml index d7da59784..97840d6a5 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -8,3 +8,4 @@ linters: enable: - gofumpt - errorlint + - unconvert diff --git a/libcontainer/cgroups/fs/cpuset.go b/libcontainer/cgroups/fs/cpuset.go index 05ee26937..c4062b7ba 100644 --- a/libcontainer/cgroups/fs/cpuset.go +++ b/libcontainer/cgroups/fs/cpuset.go @@ -224,12 +224,12 @@ func cpusetCopyIfNeeded(current, parent string) error { } if isEmptyCpuset(currentCpus) { - if err := cgroups.WriteFile(current, "cpuset.cpus", string(parentCpus)); err != nil { + if err := cgroups.WriteFile(current, "cpuset.cpus", parentCpus); err != nil { return err } } if isEmptyCpuset(currentMems) { - if err := cgroups.WriteFile(current, "cpuset.mems", string(parentMems)); err != nil { + if err := cgroups.WriteFile(current, "cpuset.mems", parentMems); err != nil { return err } } diff --git a/libcontainer/cgroups/fscommon/utils.go b/libcontainer/cgroups/fscommon/utils.go index d7ee48373..f4eee4051 100644 --- a/libcontainer/cgroups/fscommon/utils.go +++ b/libcontainer/cgroups/fscommon/utils.go @@ -85,7 +85,7 @@ func GetValueByKey(path, file, key string) (uint64, error) { return 0, err } - lines := strings.Split(string(content), "\n") + lines := strings.Split(content, "\n") for _, line := range lines { arr := strings.Split(line, " ") if len(arr) == 2 && arr[0] == key { diff --git a/libcontainer/cgroups/utils.go b/libcontainer/cgroups/utils.go index 77629bdac..75015d663 100644 --- a/libcontainer/cgroups/utils.go +++ b/libcontainer/cgroups/utils.go @@ -446,5 +446,5 @@ func ConvertBlkIOToIOWeightValue(blkIoWeight uint16) uint64 { if blkIoWeight == 0 { return 0 } - return uint64(1 + (uint64(blkIoWeight)-10)*9999/990) + return 1 + (uint64(blkIoWeight)-10)*9999/990 } diff --git a/libcontainer/container_linux.go b/libcontainer/container_linux.go index e710aab36..19a82bbf6 100644 --- a/libcontainer/container_linux.go +++ b/libcontainer/container_linux.go @@ -1029,7 +1029,7 @@ func (c *linuxContainer) Checkpoint(criuOpts *CriuOpts) error { // append optional manage cgroups mode if criuOpts.ManageCgroupsMode != 0 { - mode := criurpc.CriuCgMode(criuOpts.ManageCgroupsMode) + mode := criuOpts.ManageCgroupsMode rpcOpts.ManageCgroupsMode = &mode } @@ -1406,7 +1406,7 @@ func (c *linuxContainer) Restore(process *Process, criuOpts *CriuOpts) error { // append optional manage cgroups mode if criuOpts.ManageCgroupsMode != 0 { - mode := criurpc.CriuCgMode(criuOpts.ManageCgroupsMode) + mode := criuOpts.ManageCgroupsMode req.Opts.ManageCgroupsMode = &mode } diff --git a/libcontainer/devices/device_unix.go b/libcontainer/devices/device_unix.go index 47e586c6c..9369c6f70 100644 --- a/libcontainer/devices/device_unix.go +++ b/libcontainer/devices/device_unix.go @@ -40,7 +40,7 @@ func DeviceFromPath(path, permissions string) (*Device, error) { var ( devType Type mode = stat.Mode - devNumber = uint64(stat.Rdev) + devNumber = uint64(stat.Rdev) //nolint:unconvert // Rdev is uint32 on e.g. MIPS. major = unix.Major(devNumber) minor = unix.Minor(devNumber) ) diff --git a/libcontainer/notify_linux_v2.go b/libcontainer/notify_linux_v2.go index 8db3ac23d..8e3d4fd0d 100644 --- a/libcontainer/notify_linux_v2.go +++ b/libcontainer/notify_linux_v2.go @@ -53,7 +53,7 @@ func registerMemoryEventV2(cgDir, evName, cgEvName string) (<-chan struct{}, err offset = 0 for offset <= uint32(n-unix.SizeofInotifyEvent) { rawEvent := (*unix.InotifyEvent)(unsafe.Pointer(&buffer[offset])) - offset += unix.SizeofInotifyEvent + uint32(rawEvent.Len) + offset += unix.SizeofInotifyEvent + rawEvent.Len if rawEvent.Mask&unix.IN_MODIFY != unix.IN_MODIFY { continue }