aboutsummaryrefslogtreecommitdiff
path: root/weed/filesys/fscache.go
diff options
context:
space:
mode:
authorKonstantin Lebedev <lebedev_k@tochka.com>2021-03-16 15:29:49 +0500
committerKonstantin Lebedev <lebedev_k@tochka.com>2021-03-16 15:29:49 +0500
commiteb54993a4eacffde48007bb3bcc46b664d38c403 (patch)
tree1ef3f4cd86f9772631496a193bdeb62e25e780de /weed/filesys/fscache.go
parent06da02739d4a97dd8288f7fa05de7cd369e97d78 (diff)
parent9672f9e1b2ed399470e6ec877a667417c8b26870 (diff)
downloadseaweedfs-eb54993a4eacffde48007bb3bcc46b664d38c403.tar.xz
seaweedfs-eb54993a4eacffde48007bb3bcc46b664d38c403.zip
Merge branch 'upstreamMaster' into check_chunkviews_mr
# Conflicts: # weed/filer/filechunk_manifest.go # weed/filer/stream.go # weed/replication/repl_util/replication_util.go # weed/util/fasthttp_util.go
Diffstat (limited to 'weed/filesys/fscache.go')
-rw-r--r--weed/filesys/fscache.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/weed/filesys/fscache.go b/weed/filesys/fscache.go
index 0740d607f..6b1012090 100644
--- a/weed/filesys/fscache.go
+++ b/weed/filesys/fscache.go
@@ -126,7 +126,7 @@ func (c *FsCache) Move(oldPath util.FullPath, newPath util.FullPath) *FsNode {
f.Name = target.name
entry := f.getEntry()
if entry != nil {
- entry.FullPath = newPath
+ entry.Name = f.Name
}
}
parent.disconnectChild(target)