From 601b444a608fff8549373a3eb05b36a1ebe3b402 Mon Sep 17 00:00:00 2001
From: Simon Fraser <simonfr@gmail.com>
Date: Thu, 20 Aug 2015 09:40:32 +0100
Subject: [PATCH] fix segv on error

---
 CHANGELOG.md         | 1 +
 plugins/system/ps.go | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e50b0a8b2..1202bbb1f 100644
--- 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
index 687ccdf7e..0bf67011b 100644
--- 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)
 	}