storage/nfs: fix deadlock when connecting

The Connect method can be called between Schedule and lock. In that case, when locked, the state is already set to CONNECTING of READY and the condition won't be signaled anymore.

storage/nfs: fix deadlock when connecting
3436a646 · Thomas Guillem · Max Kellermann · aed0af1e · 3436a646 · 3436a646
Commit 3436a646 authored May 09, 2015 by Thomas Guillem Committed by Max Kellermann May 29, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

NEWS NEWS +2 -0

NfsStorage.cxx src/storage/plugins/NfsStorage.cxx +2 -2

No files found.
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ ver 0.19.10 (not yet released)
  - smbclient: fix DFF playback
 * encoder
  - opus: fix bogus granulepos
+* neighbor
+  - nfs: fix deadlock when connecting

 ver 0.19.9 (2015/02/06)
 * decoder

--- a/src/storage/plugins/NfsStorage.cxx
+++ b/src/storage/plugins/NfsStorage.cxx
@@ -177,6 +177,8 @@ private:
 				mutex.unlock();
 				DeferredMonitor::Schedule();
 				mutex.lock();
+				if (state == State::INITIAL)
+					cond.wait(mutex);
 				break;

 			case State::CONNECTING:
@@ -188,8 +190,6 @@ private:
 				error.Set(last_error);
 				return false;
 			}
-
-			cond.wait(mutex);
 		}
 	}