Skip to content
This repository has been archived by the owner on Jun 8, 2022. It is now read-only.

Fix deadlock on BSD #77

Merged
merged 1 commit into from
Nov 21, 2013
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fsnotify_bsd.go
Original file line number Diff line number Diff line change
Expand Up @@ -245,12 +245,12 @@ func (w *Watcher) removeWatch(path string) error {
watchEntry := &w.kbuf[0]
syscall.SetKevent(watchEntry, watchfd, syscall.EVFILT_VNODE, syscall.EV_DELETE)
success, errno := syscall.Kevent(w.kq, w.kbuf[:], nil, nil)
w.bufmut.Unlock()
if success == -1 {
return os.NewSyscallError("kevent_rm_watch", errno)
} else if (watchEntry.Flags & syscall.EV_ERROR) == syscall.EV_ERROR {
return errors.New("kevent rm error")
}
w.bufmut.Unlock()
syscall.Close(watchfd)
w.wmut.Lock()
delete(w.watches, path)
Expand Down