Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix IOCounters() SerialNumber enumeration #1508

Merged
merged 4 commits into from Aug 20, 2023
Merged

fix IOCounters() SerialNumber enumeration #1508

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ca6266
fix IOCounters() SerialNumber enumeration
gdvalle Aug 17, 2023
aa4c84c
Update disk/disk_linux.go
gdvalle Aug 17, 2023
b2d1f05
update comment
gdvalle Aug 17, 2023
0a23dc6
comment cleanup
gdvalle Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion disk/disk_linux.go
View file
Open in desktop
Expand Up @@ -474,7 +474,11 @@ func IOCountersWithContext(ctx context.Context, names ...string) (map[string]IOC
}
d.Name = name

d.SerialNumber, _ = SerialNumberWithContext(ctx, name)
// Names passed in can be full paths (/dev/sda) or just device names (sda).
// Since `name` here is already a basename, re-add the /dev path.
// This is not ideal, but we may break the API by changing how SerialNumberWithContext
// works.
d.SerialNumber, _ = SerialNumberWithContext(ctx, common.HostDevWithContext(ctx, name))
d.Label, _ = LabelWithContext(ctx, name)

ret[name] = d
Expand Down