diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-01-22 11:43:43 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-01-22 11:43:43 -0800 |
| commit | 09f4ceef3a5b3eca457fd74382f0391a1db4283e (patch) | |
| tree | b740b224aac770edb56b7dacc6eed3abf85e6d26 | |
| parent | d4e75a0d183b57180b2ff0be2531db540c0c9aa6 (diff) | |
| download | seaweedfs-09f4ceef3a5b3eca457fd74382f0391a1db4283e.tar.xz seaweedfs-09f4ceef3a5b3eca457fd74382f0391a1db4283e.zip | |
mount: reuse previous file node
| -rw-r--r-- | weed/filesys/dir_rename.go | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/weed/filesys/dir_rename.go b/weed/filesys/dir_rename.go index 1bd1a6470..8db879d2c 100644 --- a/weed/filesys/dir_rename.go +++ b/weed/filesys/dir_rename.go @@ -35,8 +35,9 @@ func (dir *Dir) Rename(ctx context.Context, req *fuse.RenameRequest, newDirector }) if err == nil { + newPath := filer2.NewFullPath(newDir.Path, req.NewName) oldPath := filer2.NewFullPath(dir.Path, req.OldName) - dir.wfs.cacheDelete(filer2.NewFullPath(newDir.Path, req.NewName)) + dir.wfs.cacheDelete(newPath) dir.wfs.cacheDelete(oldPath) oldFileNode := dir.wfs.getNode(oldPath, func() fs.Node { @@ -45,14 +46,17 @@ func (dir *Dir) Rename(ctx context.Context, req *fuse.RenameRequest, newDirector newDirNode := dir.wfs.getNode(filer2.FullPath(dir.Path), func() fs.Node { return nil }) - if oldFileNode != nil { + dir.wfs.forgetNode(newPath) + dir.wfs.forgetNode(oldPath) + if oldFileNode != nil && newDirNode != nil { oldFile := oldFileNode.(*File) oldFile.Name = req.NewName - if newDirNode != nil { - oldFile.dir = newDirNode.(*Dir) - } + oldFile.dir = newDirNode.(*Dir) + dir.wfs.getNode(newPath, func() fs.Node { + return oldFile + }) + } - dir.wfs.forgetNode(oldPath) } return err |