Commit 12dc123c authored by Han-Wen Nienhuys's avatar Han-Wen Nienhuys

Make zipfs tests compile and pass.

parent 6201ce0f
...@@ -317,8 +317,8 @@ func (me *FileSystemConnector) Unmount(node *Inode) Status { ...@@ -317,8 +317,8 @@ func (me *FileSystemConnector) Unmount(node *Inode) Status {
parentNode.mounts[name] = nil, false parentNode.mounts[name] = nil, false
parentNode.children[name] = nil, false parentNode.children[name] = nil, false
mount.fs.OnUnmount() mount.fs.OnUnmount()
me.fsInit.EntryNotify(parentNode.nodeId, name) me.EntryNotify(parentNode, name)
return OK return OK
} }
......
...@@ -39,6 +39,10 @@ func (me *PathNodeFs) Mount(path string, nodeFs NodeFileSystem, opts *FileSystem ...@@ -39,6 +39,10 @@ func (me *PathNodeFs) Mount(path string, nodeFs NodeFileSystem, opts *FileSystem
return me.connector.Mount(parent, name, nodeFs, opts) return me.connector.Mount(parent, name, nodeFs, opts)
} }
func (me *PathNodeFs) UnmountNode(node *Inode) Status {
return me.connector.Unmount(node)
}
func (me *PathNodeFs) Unmount(path string) Status { func (me *PathNodeFs) Unmount(path string) Status {
node := me.Node(path) node := me.Node(path)
if node == nil { if node == nil {
......
...@@ -121,7 +121,7 @@ func (me *MultiZipFs) Unlink(name string, context *fuse.Context) (code fuse.Stat ...@@ -121,7 +121,7 @@ func (me *MultiZipFs) Unlink(name string, context *fuse.Context) (code fuse.Stat
zfs, ok := me.zips[basename] zfs, ok := me.zips[basename]
if ok { if ok {
code = me.nodeFs.Unmount(zfs.Root().Inode()) code = me.nodeFs.UnmountNode(zfs.Root().Inode())
if !code.Ok() { if !code.Ok() {
return code return code
} }
...@@ -171,7 +171,7 @@ func (me *MultiZipFs) Symlink(value string, linkName string, context *fuse.Conte ...@@ -171,7 +171,7 @@ func (me *MultiZipFs) Symlink(value string, linkName string, context *fuse.Conte
return fuse.EINVAL return fuse.EINVAL
} }
code = me.nodeFs.Mount(me.nodeFs.Root().Inode(), base, fs, nil) code = me.nodeFs.Mount(base, fs, nil)
if !code.Ok() { if !code.Ok() {
return code return code
} }
......
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