From 4e793c7b5ae83d7c02503c508c9fd6645304f174 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Mon, 22 Jun 2015 19:38:11 +0900 Subject: [PATCH] Git commit mutex changes --- dir.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dir.go b/dir.go index 837b0d6..e8d2171 100644 --- a/dir.go +++ b/dir.go @@ -116,6 +116,9 @@ func (vd *verDir) createFile(name string, flags fuse.OpenFlags, mode os.FileMode } func (vd *verDir) removeDir(name string) error { + vd.mutex.Lock() + defer vd.mutex.Unlock() + if err := vd.version(); err != nil { return err } @@ -129,14 +132,14 @@ func (vd *verDir) removeDir(name string) error { vd.node.ver.meta.removeNode(node.path) } - vd.mutex.Lock() delete(vd.dirs, name) - vd.mutex.Unlock() - return nil } func (vd *verDir) removeFile(name string) error { + vd.mutex.Lock() + defer vd.mutex.Unlock() + if err := vd.version(); err != nil { return err } @@ -150,10 +153,7 @@ func (vd *verDir) removeFile(name string) error { vd.node.ver.meta.removeNode(node.path) } - vd.mutex.Lock() delete(vd.files, name) - vd.mutex.Unlock() - return nil }