gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

refactor

Browse source
This commit is contained in:
Chris Lu 2020-03-26 03:30:02 -07:00
parent 712720864d
commit c763a492f5
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
weed/filesys/fscache.go
View file

@ -64,7 +64,7 @@ func (c *FsCache) DeleteFsNode(path util.FullPath) {
}
}
if t.parent != nil {
t.parent.deleteChild(t.name)
t.parent.disconnectChild(t)
}
t.deleteSelf()
}
@ -81,9 +81,8 @@ func (c *FsCache) Move(oldPath util.FullPath, newPath util.FullPath) *FsNode {
}
}
if src.parent != nil {
src.parent.deleteChild(src.name)
src.parent.disconnectChild(src)
}
src.parent = nil
// find new node
target := c.root
@ -95,7 +94,7 @@ func (c *FsCache) Move(oldPath util.FullPath, newPath util.FullPath) *FsNode {
if dir, ok := src.node.(*Dir); ok {
dir.name = target.name // target is not Dir, but a shortcut
}
parent.deleteChild(target.name)
parent.disconnectChild(target)
target.deleteSelf()
@ -150,10 +149,11 @@ func (n *FsNode) ensureChild(name string) *FsNode {
return t
}
func (n *FsNode) deleteChild(name string) {
func (n *FsNode) disconnectChild(child *FsNode) {
n.childrenLock.Lock()
delete(n.children, name)
delete(n.children, child.name)
n.childrenLock.Unlock()
child.parent = nil
}
func (n *FsNode) deleteSelf() {