From b51f14aa7b2be372b88c218d830b27573a7a2c8d Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sun, 21 Jun 2015 22:02:46 +0900 Subject: [PATCH] Cleanup --- dir.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dir.go b/dir.go index b4c3de1..c076b84 100644 --- a/dir.go +++ b/dir.go @@ -109,6 +109,10 @@ func (vd *verDir) createFile(name string, flags fuse.OpenFlags, mode os.FileMode } func (vd *verDir) removeDir(name string) error { + if err := vd.version(); err != nil { + return err + } + node := vd.dirs[name].node ver := node.ver @@ -127,6 +131,10 @@ func (vd *verDir) removeDir(name string) error { } func (vd *verDir) removeFile(name string) error { + if err := vd.version(); err != nil { + return err + } + node := vd.files[name].node ver := node.ver @@ -195,10 +203,6 @@ func (vd *verDir) Remove(ctx context.Context, req *fuse.RemoveRequest) error { vd.mutex.Lock() defer vd.mutex.Unlock() - if err := vd.version(); err != nil { - return err - } - if req.Dir { return vd.removeDir(req.Name) } else {