octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-10 15:20:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reorder locking to avoid deadlock (fixes #64)

Browse Source
This commit is contained in:
Jakob Borg 2014-02-13 11:33:32 +01:00
parent 5daf6ecf70
commit c171780c0d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
filequeue.go
View File

@ -220,10 +220,10 @@ func (q *FileQueue) SetAvailable(file string, nodes []string) {
} }
func (q *FileQueue) RemoveAvailable(toRemove string) { func (q *FileQueue) RemoveAvailable(toRemove string) {
q.amut.Lock()
q.fmut.Lock() q.fmut.Lock()
defer q.fmut.Unlock() q.amut.Lock()
defer q.amut.Unlock() defer q.amut.Unlock()
defer q.fmut.Unlock()
for file, nodes := range q.availability { for file, nodes := range q.availability {
for i, node := range nodes { for i, node := range nodes {