From: Greg Farnum <gregf@hq.newdream.net>
Date: Fri, 22 Oct 2010 18:24:24 +0000 (-0700)
Subject: Merge branch 'msgr' into unstable
X-Git-Tag: v0.23~119
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=55fcbc649c42f029ca63a1f36acc5244beacf705;p=ceph.git

Merge branch 'msgr' into unstable
---

55fcbc649c42f029ca63a1f36acc5244beacf705
diff --cc src/msg/SimpleMessenger.cc
index eb487f609362,73374428e300..0a74d2dd7d38
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@@ -895,13 -891,16 +891,18 @@@ int SimpleMessenger::Pipe::accept(
    pipe_lock.Unlock();
    return 0;   // success.
  
- 
   fail_unlocked:
 +  if (existing)
 +    existing->pipe_lock.Unlock();
    pipe_lock.Lock();
-   state = STATE_CLOSED;
+   bool queued = is_queued();
+   if (queued)
+     state = STATE_CONNECTING;
+   else
+     state = STATE_CLOSED;
    fault();
+   if (queued)
+     start_writer();
    pipe_lock.Unlock();
    return -1;
  }