github-mirror/rclone
2
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-25 09:41:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

vfs: make File lock and Dir lock not overlap to avoid deadlock

Browse Source 
This was caused by this commit which wasn't part of 1.51.0

3c91abce74 vfs: fix race condition caused by unlocked reading of Dir.path
This commit is contained in:
Nick Craig-Wood 2020-04-02 21:14:45 +01:00
parent 2a62471e4c
commit 3911a49256
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vfs/file.go
View File

@ -97,8 +97,9 @@ func (f *File) _path() string {
// Path returns the full path of the file // Path returns the full path of the file
func (f *File) Path() string { func (f *File) Path() string {
f.mu.RLock() f.mu.RLock()
defer f.mu.RUnlock() d, leaf := f.d, f.leaf
return f._path() f.mu.RUnlock()
return path.Join(d.Path(), leaf)
} }
// osPath returns the full path of the file in the cache in OS format // osPath returns the full path of the file in the cache in OS format