prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2368 from huchengze/patch-1

Browse Source 
Support for mips
This commit is contained in:
David Ashpole 2020-01-07 17:34:30 -08:00 committed by GitHub
commit 947eb3cdb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/fs.go
View File

@ -510,8 +510,9 @@ func (self *RealFsInfo) GetDirFsDevice(dir string) (*DeviceInfo, error) {
return nil, fmt.Errorf("stat failed on %s with error: %s", dir, err) return nil, fmt.Errorf("stat failed on %s with error: %s", dir, err)
} }
major := major(buf.Dev) // The type Dev in Stat_t is 32bit on mips.
minor := minor(buf.Dev) major := major(uint64(buf.Dev)) // nolint: unconvert
minor := minor(uint64(buf.Dev)) // nolint: unconvert
for device, partition := range self.partitions { for device, partition := range self.partitions {
if partition.major == major && partition.minor == minor { if partition.major == major && partition.minor == minor {
return &DeviceInfo{device, major, minor}, nil return &DeviceInfo{device, major, minor}, nil
@ -752,10 +753,11 @@ func getBtrfsMajorMinorIds(mount *mount.Info) (int, int, error) {
return 0, 0, err return 0, 0, err
} }
klog.V(4).Infof("btrfs dev major:minor %d:%d\n", int(major(buf.Dev)), int(minor(buf.Dev))) // The type Dev and Rdev in Stat_t are 32bit on mips.
klog.V(4).Infof("btrfs rdev major:minor %d:%d\n", int(major(buf.Rdev)), int(minor(buf.Rdev))) klog.V(4).Infof("btrfs dev major:minor %d:%d\n", int(major(uint64(buf.Dev))), int(minor(uint64(buf.Dev)))) // nolint: unconvert
klog.V(4).Infof("btrfs rdev major:minor %d:%d\n", int(major(uint64(buf.Rdev))), int(minor(uint64(buf.Rdev)))) // nolint: unconvert
return int(major(buf.Dev)), int(minor(buf.Dev)), nil return int(major(uint64(buf.Dev))), int(minor(uint64(buf.Dev))), nil // nolint: unconvert
} else { } else {
return 0, 0, fmt.Errorf("%s is not a block device", mount.Source) return 0, 0, fmt.Errorf("%s is not a block device", mount.Source)
} }