perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/db: Defer unlock to avoid hangup on panic (#5388)

Browse Source
This commit is contained in:
Simon Frei
2018-12-17 14:59:09 +01:00
committed by Jakob Borg
parent c40c9a8d6a
commit 3cc8918eb4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/db/meta.go
View File

@@ -113,6 +113,8 @@ func (m *metadataTracker) addFile(dev protocol.DeviceID, f FileIntf) {
} }
m.mut.Lock() m.mut.Lock()
defer m.mut.Unlock()
m.dirty = true m.dirty = true
if flags := f.FileLocalFlags(); flags == 0 { if flags := f.FileLocalFlags(); flags == 0 {
@@ -124,8 +126,6 @@ func (m *metadataTracker) addFile(dev protocol.DeviceID, f FileIntf) {
m.addFileLocked(dev, flag, f) m.addFileLocked(dev, flag, f)
}) })
} }
m.mut.Unlock()
} }
func (m *metadataTracker) addFileLocked(dev protocol.DeviceID, flags uint32, f FileIntf) { func (m *metadataTracker) addFileLocked(dev protocol.DeviceID, flags uint32, f FileIntf) {
@@ -156,6 +156,8 @@ func (m *metadataTracker) removeFile(dev protocol.DeviceID, f FileIntf) {
} }
m.mut.Lock() m.mut.Lock()
defer m.mut.Unlock()
m.dirty = true m.dirty = true
if flags := f.FileLocalFlags(); flags == 0 { if flags := f.FileLocalFlags(); flags == 0 {
@@ -167,8 +169,6 @@ func (m *metadataTracker) removeFile(dev protocol.DeviceID, f FileIntf) {
m.removeFileLocked(dev, flag, f) m.removeFileLocked(dev, flag, f)
}) })
} }
m.mut.Unlock()
} }
func (m *metadataTracker) removeFileLocked(dev protocol.DeviceID, flags uint32, f FileIntf) { func (m *metadataTracker) removeFileLocked(dev protocol.DeviceID, flags uint32, f FileIntf) {