Skip to content

Use /proc/mounts instead of statfs(2) for ro state #1002

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

Merged
SuperQ merged 1 commit into from
Jul 16, 2018
Merged

Use /proc/mounts instead of statfs(2) for ro state #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion collector/filesystem_common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ type filesystemCollector struct {
}

type filesystemLabels struct {
device, mountPoint, fsType string
device, mountPoint, fsType, options string
}

type filesystemStats struct {
Expand Down
8 changes: 6 additions & 2 deletions collector/filesystem_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,11 @@ func (c *filesystemCollector) GetStats() ([]filesystemStats, error) {
}

var ro float64
if (buf.Flags & readOnly) != 0 {
ro = 1
for _, option := range strings.Split(labels.options, ",") {
if option == "ro" {
ro = 1
break
}
}

stats = append(stats, filesystemStats{
Expand Down Expand Up @@ -97,6 +100,7 @@ func mountPointDetails() ([]filesystemLabels, error) {
device: parts[0],
mountPoint: parts[1],
fsType: parts[2],
options: parts[3],
})
}
return filesystems, scanner.Err()
Expand Down