fix segv on error

influxdata · Aug 20, 2015 · 601b444 · 601b444
1 parent 4b06712
commit 601b444
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 ### Bugfixes
 [#113](https://github.com/influxdb/telegraf/issues/113): Update README with Telegraf/InfluxDB compatibility
 [#118](https://github.com/influxdb/telegraf/pull/118): Fix for disk usage stats in Windows. Thanks @srfraser!
+[#122](https://github.com/influxdb/telegraf/issues/122): Fix for DiskUsage segv fault. Thanks @srfraser!
 
 ## v0.1.5 [2015-08-13]
 

diff --git a/plugins/system/ps.go b/plugins/system/ps.go
@@ -78,11 +78,10 @@ func (s *systemPS) DiskUsage() ([]*disk.DiskUsageStat, error) {
 
 	for _, p := range parts {
 		du, err := disk.DiskUsage(p.Mountpoint)
-		du.Fstype = p.Fstype
 		if err != nil {
 			return nil, err
 		}
-
+		du.Fstype = p.Fstype
 		usage = append(usage, du)
 	}