clean up files locking

whyrusleeping · whyrusleeping · commit 1f0185402bbc · 2016-01-24T13:06:05.000-08:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
diff --git a/core/commands/files/files.go b/core/commands/files/files.go
@@ -501,10 +501,6 @@ Warning:
 
 		create, _, _ := req.Option("create").Bool()
 		trunc, _, _ := req.Option("truncate").Bool()
-		flush, set, _ := req.Option("flush").Bool()
-		if !set {
-			flush = true
-		}
 
 		nd, err := req.InvocContext().GetNode()
 		if err != nil {
@@ -528,18 +524,7 @@ Warning:
 			return
 		}
 
-		if flush {
-			defer func() {
-				fi.Close()
-				err := mfs.FlushPath(nd.FilesRoot, path)
-				if err != nil {
-					res.SetError(err, cmds.ErrNormal)
-					return
-				}
-			}()
-		} else {
-			defer fi.Sync()
-		}
+		defer fi.Close()
 
 		if trunc {
 			if err := fi.Truncate(0); err != nil {
diff --git a/mfs/file.go b/mfs/file.go
@@ -95,13 +95,12 @@ func (fi *File) flushUp() error {
 		return err
 	}
 
-	//name := fi.name
-	//parent := fi.parent
+	name := fi.name
+	parent := fi.parent
 
 	// explicit unlock *only* before closeChild call
 	fi.Unlock()
-	return nil
-	//return parent.closeChild(name, nd)
+	return parent.closeChild(name, nd)
 }
 
 // Sync flushes the changes in the file to disk

Original file line number	Diff line number	Diff line change
`@@ -95,13 +95,12 @@ func (fi *File) flushUp() error {`
`95`	`95`	`return err`
`96`	`96`	`}`
`97`	`97`
`98`		`- //name := fi.name`
`99`		`- //parent := fi.parent`
	`98`	`+ name := fi.name`
	`99`	`+ parent := fi.parent`
`100`	`100`
`101`	`101`	`// explicit unlock only before closeChild call`
`102`	`102`	`fi.Unlock()`
`103`		`- return nil`
`104`		`- //return parent.closeChild(name, nd)`
	`103`	`+ return parent.closeChild(name, nd)`
`105`	`104`	`}`
`106`	`105`
`107`	`106`	`// Sync flushes the changes in the file to disk`