Fixed memfs.

geesefs-0-30-9
Aaron Jacobs 2015-06-05 14:22:02 +10:00
parent b791d33db0
commit afd13efb65
1 changed files with 15 additions and 60 deletions

View File

@ -200,18 +200,12 @@ func (fs *memFS) deallocateInode(id fuseops.InodeID) {
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
func (fs *memFS) Init( func (fs *memFS) Init(
op *fuseops.InitOp) { op *fuseops.InitOp) (err error) {
var err error
defer fuseutil.RespondToOp(op, &err)
return return
} }
func (fs *memFS) LookUpInode( func (fs *memFS) LookUpInode(
op *fuseops.LookUpInodeOp) { op *fuseops.LookUpInodeOp) (err error) {
var err error
defer fuseutil.RespondToOp(op, &err)
fs.mu.Lock() fs.mu.Lock()
defer fs.mu.Unlock() defer fs.mu.Unlock()
@ -243,10 +237,7 @@ func (fs *memFS) LookUpInode(
} }
func (fs *memFS) GetInodeAttributes( func (fs *memFS) GetInodeAttributes(
op *fuseops.GetInodeAttributesOp) { op *fuseops.GetInodeAttributesOp) (err error) {
var err error
defer fuseutil.RespondToOp(op, &err)
fs.mu.Lock() fs.mu.Lock()
defer fs.mu.Unlock() defer fs.mu.Unlock()
@ -265,10 +256,7 @@ func (fs *memFS) GetInodeAttributes(
} }
func (fs *memFS) SetInodeAttributes( func (fs *memFS) SetInodeAttributes(
op *fuseops.SetInodeAttributesOp) { op *fuseops.SetInodeAttributesOp) (err error) {
var err error
defer fuseutil.RespondToOp(op, &err)
fs.mu.Lock() fs.mu.Lock()
defer fs.mu.Unlock() defer fs.mu.Unlock()
@ -290,10 +278,7 @@ func (fs *memFS) SetInodeAttributes(
} }
func (fs *memFS) MkDir( func (fs *memFS) MkDir(
op *fuseops.MkDirOp) { op *fuseops.MkDirOp) (err error) {
var err error
defer fuseutil.RespondToOp(op, &err)
fs.mu.Lock() fs.mu.Lock()
defer fs.mu.Unlock() defer fs.mu.Unlock()
@ -338,10 +323,7 @@ func (fs *memFS) MkDir(
} }
func (fs *memFS) CreateFile( func (fs *memFS) CreateFile(
op *fuseops.CreateFileOp) { op *fuseops.CreateFileOp) (err error) {
var err error
defer fuseutil.RespondToOp(op, &err)
fs.mu.Lock() fs.mu.Lock()
defer fs.mu.Unlock() defer fs.mu.Unlock()
@ -393,10 +375,7 @@ func (fs *memFS) CreateFile(
} }
func (fs *memFS) CreateSymlink( func (fs *memFS) CreateSymlink(
op *fuseops.CreateSymlinkOp) { op *fuseops.CreateSymlinkOp) (err error) {
var err error
defer fuseutil.RespondToOp(op, &err)
fs.mu.Lock() fs.mu.Lock()
defer fs.mu.Unlock() defer fs.mu.Unlock()
@ -449,10 +428,7 @@ func (fs *memFS) CreateSymlink(
} }
func (fs *memFS) RmDir( func (fs *memFS) RmDir(
op *fuseops.RmDirOp) { op *fuseops.RmDirOp) (err error) {
var err error
defer fuseutil.RespondToOp(op, &err)
fs.mu.Lock() fs.mu.Lock()
defer fs.mu.Unlock() defer fs.mu.Unlock()
@ -487,10 +463,7 @@ func (fs *memFS) RmDir(
} }
func (fs *memFS) Unlink( func (fs *memFS) Unlink(
op *fuseops.UnlinkOp) { op *fuseops.UnlinkOp) (err error) {
var err error
defer fuseutil.RespondToOp(op, &err)
fs.mu.Lock() fs.mu.Lock()
defer fs.mu.Unlock() defer fs.mu.Unlock()
@ -519,10 +492,7 @@ func (fs *memFS) Unlink(
} }
func (fs *memFS) OpenDir( func (fs *memFS) OpenDir(
op *fuseops.OpenDirOp) { op *fuseops.OpenDirOp) (err error) {
var err error
defer fuseutil.RespondToOp(op, &err)
fs.mu.Lock() fs.mu.Lock()
defer fs.mu.Unlock() defer fs.mu.Unlock()
@ -540,10 +510,7 @@ func (fs *memFS) OpenDir(
} }
func (fs *memFS) ReadDir( func (fs *memFS) ReadDir(
op *fuseops.ReadDirOp) { op *fuseops.ReadDirOp) (err error) {
var err error
defer fuseutil.RespondToOp(op, &err)
fs.mu.Lock() fs.mu.Lock()
defer fs.mu.Unlock() defer fs.mu.Unlock()
@ -562,10 +529,7 @@ func (fs *memFS) ReadDir(
} }
func (fs *memFS) OpenFile( func (fs *memFS) OpenFile(
op *fuseops.OpenFileOp) { op *fuseops.OpenFileOp) (err error) {
var err error
defer fuseutil.RespondToOp(op, &err)
fs.mu.Lock() fs.mu.Lock()
defer fs.mu.Unlock() defer fs.mu.Unlock()
@ -583,10 +547,7 @@ func (fs *memFS) OpenFile(
} }
func (fs *memFS) ReadFile( func (fs *memFS) ReadFile(
op *fuseops.ReadFileOp) { op *fuseops.ReadFileOp) (err error) {
var err error
defer fuseutil.RespondToOp(op, &err)
fs.mu.Lock() fs.mu.Lock()
defer fs.mu.Unlock() defer fs.mu.Unlock()
@ -608,10 +569,7 @@ func (fs *memFS) ReadFile(
} }
func (fs *memFS) WriteFile( func (fs *memFS) WriteFile(
op *fuseops.WriteFileOp) { op *fuseops.WriteFileOp) (err error) {
var err error
defer fuseutil.RespondToOp(op, &err)
fs.mu.Lock() fs.mu.Lock()
defer fs.mu.Unlock() defer fs.mu.Unlock()
@ -626,10 +584,7 @@ func (fs *memFS) WriteFile(
} }
func (fs *memFS) ReadSymlink( func (fs *memFS) ReadSymlink(
op *fuseops.ReadSymlinkOp) { op *fuseops.ReadSymlinkOp) (err error) {
var err error
defer fuseutil.RespondToOp(op, &err)
fs.mu.Lock() fs.mu.Lock()
defer fs.mu.Unlock() defer fs.mu.Unlock()