From d7e70cb7dc0d0a082c9200b4d3fcda290038c5b5 Mon Sep 17 00:00:00 2001 From: Aaron Jacobs Date: Wed, 25 Mar 2015 10:00:01 +1100 Subject: [PATCH] Fixed cachingfs. --- samples/cachingfs/caching_fs.go | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/samples/cachingfs/caching_fs.go b/samples/cachingfs/caching_fs.go index c3f6c0f..d2b0224 100644 --- a/samples/cachingfs/caching_fs.go +++ b/samples/cachingfs/caching_fs.go @@ -239,13 +239,19 @@ func (fs *cachingFS) SetMtime(mtime time.Time) { //////////////////////////////////////////////////////////////////////// func (fs *cachingFS) Init( - op *fuseops.InitOp) (err error) { + op *fuseops.InitOp) { + var err error + defer fuseutil.RespondToOp(op, &err) + return } // LOCKS_EXCLUDED(fs.mu) func (fs *cachingFS) LookUpInode( - op *fuseops.LookUpInodeOp) (err error) { + op *fuseops.LookUpInodeOp) { + var err error + defer fuseutil.RespondToOp(op, &err) + fs.mu.Lock() defer fs.mu.Unlock() @@ -299,7 +305,10 @@ func (fs *cachingFS) LookUpInode( // LOCKS_EXCLUDED(fs.mu) func (fs *cachingFS) GetInodeAttributes( - op *fuseops.GetInodeAttributesOp) (err error) { + op *fuseops.GetInodeAttributesOp) { + var err error + defer fuseutil.RespondToOp(op, &err) + fs.mu.Lock() defer fs.mu.Unlock() @@ -328,11 +337,17 @@ func (fs *cachingFS) GetInodeAttributes( } func (fs *cachingFS) OpenDir( - op *fuseops.OpenDirOp) (err error) { + op *fuseops.OpenDirOp) { + var err error + defer fuseutil.RespondToOp(op, &err) + return } func (fs *cachingFS) OpenFile( - op *fuseops.OpenFileOp) (err error) { + op *fuseops.OpenFileOp) { + var err error + defer fuseutil.RespondToOp(op, &err) + return }