Make start/end edit resilient against inverted request ordering.

hanwen · Feb 13, 2013 · 6070a13 · 6070a13
1 parent b900406
commit 6070a13
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/fs/android.go b/fs/android.go
@@ -33,6 +33,10 @@ func (f *androidFile) String() string {
 }
 
 func (f *androidFile) Write(dest []byte, off int64) (written uint32, status fuse.Status) {
+	if !f.node.startEdit() {
+		return 0, fuse.EIO
+	}
+
 	b := bytes.NewBuffer(dest)
 	err := f.node.fs.dev.AndroidSendPartialObject(f.node.Handle(), off, uint32(len(dest)), b)
 	if err != nil {
@@ -46,6 +50,9 @@ func (f *androidFile) Write(dest []byte, off int64) (written uint32, status fuse
 	return written, fuse.OK
 }
 
-func (f *androidFile) Release() {
-	f.node.endEdit()
+func (f *androidFile) Flush() fuse.Status {
+	if !f.node.endEdit() {
+		return fuse.EIO
+	}
+	return fuse.OK
 }
diff --git a/fs/fs.go b/fs/fs.go
@@ -303,13 +303,6 @@ func (n *fileNode) endEdit() bool {
 }
 
 func (n *fileNode) Open(flags uint32, context *fuse.Context) (file fuse.File, code fuse.Status) {
-	write := (flags&fuse.O_ANYWRITE != 0)
-	if write {
-		if !n.startEdit() {
-			return nil, fuse.EIO
-		}
-	}
-
 	return &androidFile{node: n}, fuse.OK
 }