github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-28 19:54:35 +00:00
Code Issues Projects Releases Wiki Activity

runtime: clear virtcontainers cgroup duplicated function

Browse Source 
There are `DeviceToDeviceCgroup` and `deviceToDeviceCgroup` two functions,
 creating a `specs.LinuxDeviceCgroup` object. We clear the new function `deviceToDeviceCgroup`.

Fixes: #2694

Signed-off-by: wangyongchao.bj <wangyongchao.bj@inspur.com>
This commit is contained in:
wangyongchao.bj 2021-09-22 15:13:34 +08:00
parent 32c3fb71f2
commit 3b0c4bf9a0
1 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/runtime/virtcontainers/pkg/cgroups/cgroups.go
View File

@ -13,8 +13,6 @@ import (
v1 "github.com/containerd/cgroups/stats/v1"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/sirupsen/logrus"
"golang.org/x/sys/unix"
)
type Cgroup struct {
@ -37,33 +35,6 @@ func SetLogger(logger *logrus.Entry) {
cgroupsLogger = logger.WithFields(fields)
}
func deviceToDeviceCgroup(device string) (*specs.LinuxDeviceCgroup, error) {
var st unix.Stat_t
if err := unix.Stat(device, &st); err != nil {
return nil, err
}
devType := ""
switch st.Mode & unix.S_IFMT {
case unix.S_IFCHR:
devType = "c"
case unix.S_IFBLK:
devType = "b"
}
major := int64(unix.Major(st.Rdev))
minor := int64(unix.Minor(st.Rdev))
return &specs.LinuxDeviceCgroup{
Allow: true,
Type: devType,
Major: &major,
Minor: &minor,
Access: "rwm",
}, nil
}
func sandboxDevices() []specs.LinuxDeviceCgroup {
devices := []specs.LinuxDeviceCgroup{}
@ -90,12 +61,12 @@ func sandboxDevices() []specs.LinuxDeviceCgroup {
defaultDevices = append(defaultDevices, hypervisorDevices...)
for _, device := range defaultDevices {
ldevice, err := deviceToDeviceCgroup(device)
ldevice, err := DeviceToLinuxDevice(device)
if err != nil {
cgroupsLogger.WithField("source", "cgroups").Warnf("Could not add %s to the devices cgroup", device)
continue
}
devices = append(devices, *ldevice)
devices = append(devices, ldevice)
}
wildcardMajor := int64(-1)