Merge pull request #47 from b5/switch_defer

check error before defer-removing disk usage file

Merge pull request #47 from b5/switch_defer
check error before defer-removing disk usage file
99c0640e · Kevin Atkinson · GitHub · d25f80d9 · 21dc9bb7 · 99c0640e
Unverified Commit 99c0640e authored Sep 10, 2018 by Kevin Atkinson Committed by GitHub Sep 10, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

flatfs.go flatfs.go +5 -4

No files found.
--- a/flatfs.go
+++ b/flatfs.go
@@ -863,6 +863,11 @@ func (fs *Datastore) checkpointLoop() {

 func (fs *Datastore) writeDiskUsageFile(du int64, doSync bool) {
 	tmp, err := ioutil.TempFile(fs.path, "du-")
+	if err != nil {
+		log.Warningf("cound not write disk usage: %v", err)
+		return
+	}
+
 	removed := false
 	defer func() {
 		if !removed {
@@ -870,10 +875,6 @@ func (fs *Datastore) writeDiskUsageFile(du int64, doSync bool) {
 			_ = os.Remove(tmp.Name())
 		}
 	}()
-	if err != nil {
-		log.Warningf("cound not write disk usage: %v", err)
-		return
-	}

 	toWrite := fs.storedValue
 	toWrite.DiskUsage = du