OrgGo
/
shirou_gopsutil
mirror of https://hub.fastgit.org/shirou/gopsutil.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix some issue.

This commit is contained in:
JHE 2019-02-07 00:01:51 +08:00
parent a5cb715e64
commit 06a21ae66a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
disk/disk_linux.go
View File

@ -224,16 +224,16 @@ func Partitions(all bool) ([]PartitionStat, error) {
} }
func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, error) { func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, error) {
UseMounts := false useMounts := false
filename := common.HostProc("self/mountinfo") filename := common.HostProc("self/mountinfo")
lines, err := common.ReadLines(filename) lines, err := common.ReadLines(filename)
if err != nil { if err != nil {
UseMounts = true useMounts = true
} }
//if kernel not support self/mountinfo //if kernel not support self/mountinfo
if UseMounts == true { if useMounts {
filename := common.HostProc("self/mounts") filename := common.HostProc("self/mounts")
lines, err = common.ReadLines(filename) lines, err = common.ReadLines(filename)
if err != nil { if err != nil {
@ -256,7 +256,7 @@ func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, erro
// (1) (2) (3) (4) (5) (6) (7) (8) (9) (10) (11) // (1) (2) (3) (4) (5) (6) (7) (8) (9) (10) (11)
// split the mountinfo line by the separator hyphen // split the mountinfo line by the separator hyphen
if UseMounts == true { if useMounts {
fields := strings.Fields(line) fields := strings.Fields(line)
d = PartitionStat{ d = PartitionStat{
@ -266,7 +266,7 @@ func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, erro
Opts: fields[3], Opts: fields[3],
} }
if all == false { if !all {
if d.Device == "none" || !common.StringsHas(fs, d.Fstype) { if d.Device == "none" || !common.StringsHas(fs, d.Fstype) {
continue continue
} }
@ -293,7 +293,7 @@ func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, erro
Opts: mountOpts, Opts: mountOpts,
} }
if all == false { if !all {
if d.Device == "none" || !common.StringsHas(fs, d.Fstype) { if d.Device == "none" || !common.StringsHas(fs, d.Fstype) {
continue continue
} }