opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 03:08:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13258 from robbmanes/bitshift_st_rdev

Browse Source 
Calculate device major/minor using bitshift
This commit is contained in:
OpenShift Merge Robot
2022-02-17 04:20:00 -05:00
committed by GitHub
parent f918a9418f 90066af62e
commit 3c99cff3d1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/util/utils_linux.go
View File

@ -39,8 +39,10 @@ func FindDeviceNodes() (map[string]string, error) {
if !ok { if !ok {
return errors.Errorf("Could not convert stat output for use") return errors.Errorf("Could not convert stat output for use")
} }
major := sysstat.Rdev / 256 // We must typeconvert sysstat.Rdev from uint64->int to avoid constant overflow
minor := sysstat.Rdev % 256 rdev := int(sysstat.Rdev)
major := ((rdev >> 8) & 0xfff) | ((rdev >> 32) & ^0xfff)
minor := (rdev & 0xff) | ((rdev >> 12) & ^0xff)
nodes[fmt.Sprintf("%d:%d", major, minor)] = path nodes[fmt.Sprintf("%d:%d", major, minor)] = path