msgr: fix shutdown race again

Only unlock once.  Sigh.

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

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