From 76e88d10a0e1e08bccec2a6e6393ab72d97e6cdb Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Sun, 19 Feb 2012 14:52:41 -0800
Subject: [PATCH] msgr: fix accept shutdown race fault

Need to hold pipe_lock.

Signed-off-by: Sage Weil <sage@newdream.net>
---
 src/msg/SimpleMessenger.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index a6898e37e28c6..0390ee9ba3d93 100644
--- 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;
 }
-- 
2.47.3