]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "messenger: Make sure to unlock existing->pipe_lock. There are a few cases...
authorGreg Farnum <gregf@hq.newdream.net>
Fri, 22 Oct 2010 20:36:30 +0000 (13:36 -0700)
committerGreg Farnum <gregf@hq.newdream.net>
Fri, 22 Oct 2010 20:36:30 +0000 (13:36 -0700)
This reverts commit 96692d24c8cdf0fe88260949b67f8580e0c70696.
This patch accidentally got merged into the tree twice, so
merging issues came up.

src/msg/SimpleMessenger.cc

index 0a74d2dd7d38dedb7d5813c61c4072b949ae1f63..73374428e300ef863f651cd1b4247a599f21f010 100644 (file)
@@ -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)