From: Greg Farnum <gregf@hq.newdream.net>
Date: Fri, 22 Oct 2010 20:36:30 +0000 (-0700)
Subject: Revert "messenger: Make sure to unlock existing->pipe_lock. There are a few cases... 
X-Git-Tag: v0.23~117
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=429b2d9954152f86fd42280ea212774131a75bd5;p=ceph.git

Revert "messenger: Make sure to unlock existing->pipe_lock. There are a few cases in the "open" section where we can go to fail_unlocked while still holding existing->pipe_lock. So unlock it."

This reverts commit 96692d24c8cdf0fe88260949b67f8580e0c70696.
This patch accidentally got merged into the tree twice, so
merging issues came up.
---

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 0a74d2dd7d38..73374428e300 100644
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -892,8 +892,6 @@ int SimpleMessenger::Pipe::accept()
   return 0;   // success.
 
  fail_unlocked:
-  if (existing)
-    existing->pipe_lock.Unlock();
   pipe_lock.Lock();
   bool queued = is_queued();
   if (queued)