msgr: fix accept shutdown race fault

Need to hold pipe_lock.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index a6898e37e28c60b36bb8868902b3025c2c11cd67..0390ee9ba3d93d85d7fd04e0948ed8ef67e727df 100644 (file)
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -1008,7 +1008,9 @@ int SimpleMessenger::Pipe::accept()
  shutting_down:
   msgr->lock.Unlock();
   state = STATE_CLOSED;
+  pipe_lock.Lock();
   fault();
+  pipe_lock.Unlock();
   msgr->lock.Unlock();
   return -1;
 }