Commit 02502040 authored by Han-Wen Nienhuys's avatar Han-Wen Nienhuys

nodefs: don't embed RawFileSystem

parent 45eb49de
...@@ -21,8 +21,6 @@ type fileEntry struct { ...@@ -21,8 +21,6 @@ type fileEntry struct {
} }
type rawBridge struct { type rawBridge struct {
fuse.RawFileSystem
options Options options Options
root *Inode root *Inode
...@@ -85,8 +83,7 @@ func (b *rawBridge) newInode(node Operations, mode uint32, id FileID, persistent ...@@ -85,8 +83,7 @@ func (b *rawBridge) newInode(node Operations, mode uint32, id FileID, persistent
func NewNodeFS(root Operations, opts *Options) fuse.RawFileSystem { func NewNodeFS(root Operations, opts *Options) fuse.RawFileSystem {
bridge := &rawBridge{ bridge := &rawBridge{
RawFileSystem: fuse.NewDefaultRawFileSystem(), automaticIno: 1 << 63,
automaticIno: 1 << 63,
} }
if opts != nil { if opts != nil {
...@@ -116,6 +113,10 @@ func NewNodeFS(root Operations, opts *Options) fuse.RawFileSystem { ...@@ -116,6 +113,10 @@ func NewNodeFS(root Operations, opts *Options) fuse.RawFileSystem {
return bridge return bridge
} }
func (b *rawBridge) String() string {
return "rawBridge"
}
func (b *rawBridge) inode(id uint64, fh uint64) (*Inode, fileEntry) { func (b *rawBridge) inode(id uint64, fh uint64) (*Inode, fileEntry) {
b.mu.Lock() b.mu.Lock()
defer b.mu.Unlock() defer b.mu.Unlock()
...@@ -515,7 +516,7 @@ func (b *rawBridge) Fallocate(input *fuse.FallocateIn) (code fuse.Status) { ...@@ -515,7 +516,7 @@ func (b *rawBridge) Fallocate(input *fuse.FallocateIn) (code fuse.Status) {
} }
func (b *rawBridge) OpenDir(input *fuse.OpenIn, out *fuse.OpenOut) (status fuse.Status) { func (b *rawBridge) OpenDir(input *fuse.OpenIn, out *fuse.OpenOut) (status fuse.Status) {
return return fuse.ENOSYS
} }
func (b *rawBridge) ReadDir(input *fuse.ReadIn, out *fuse.DirEntryList) fuse.Status { func (b *rawBridge) ReadDir(input *fuse.ReadIn, out *fuse.DirEntryList) fuse.Status {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment