Merge branch 'unstable' of ceph.newdream.net:/git/ceph into unstable

Conflicts:

	src/msg/SimpleMessenger.cc

diff --cc src/msg/SimpleMessenger.cc
index 3710392b93d7469e361e7e7359604ee68f03e1da,85a0ad05c40a16d37bb94754cebe6a40910e57aa..1698f3640f11a6f189e53af552616570c115b6ba
--- 1/src/msg/SimpleMessenger.cc
--- 2/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@@ -128,23 -128,22 +128,22 @@@ int SimpleMessenger::Accepter::bind(int
      return -errno;
    }
    
 -  rank->rank_addr = g_my_addr;
 -  if (rank->rank_addr != entity_addr_t())
 -    rank->need_addr = false;
 +  messenger->ms_addr = g_my_addr;
 +  if (messenger->ms_addr != entity_addr_t())
 +    messenger->need_addr = false;
    else 
 -    rank->need_addr = true;
 +    messenger->need_addr = true;
  
 -  if (rank->rank_addr.get_port() == 0) {
 -    rank->rank_addr.in4_addr() = listen_addr;
 +  if (messenger->ms_addr.get_port() == 0) {
 +    messenger->ms_addr.in4_addr() = listen_addr;
      if (force_nonce >= 0)
 -      rank->rank_addr.nonce = force_nonce;
 +      messenger->ms_addr.nonce = force_nonce;
      else
 -      rank->rank_addr.nonce = getpid(); // FIXME: pid might not be best choice here.
 +      messenger->ms_addr.nonce = getpid(); // FIXME: pid might not be best choice here.
    }
-   messenger->ms_addr.erank = 0;
  
 -  dout(1) << "accepter.bind rank_addr is " << rank->rank_addr << " need_addr=" << rank->need_addr << dendl;
 -  rank->did_bind = true;
 +  dout(1) << "accepter.bind ms_addr is " << messenger->ms_addr << " need_addr=" << messenger->need_addr << dendl;
 +  messenger->did_bind = true;
    return 0;
  }
  
@@@ -450,10 -452,23 +449,9 @@@ int SimpleMessenger::lazy_send_message(
    return 0;
  }
  
 -int SimpleMessenger::Endpoint::send_keepalive(entity_inst_t dest)
 -{
 -  rank->send_keepalive(dest);
 -  return 0;
 -}
 -
 -
 -
 -void SimpleMessenger::Endpoint::mark_down(entity_addr_t a)
 -{
 -  rank->mark_down(a);
 -}
 -
 -
 -entity_addr_t SimpleMessenger::Endpoint::get_myaddr()
 +entity_addr_t SimpleMessenger::get_myaddr()
  {
 -  entity_addr_t a = rank->rank_addr;
 +  entity_addr_t a = messenger->ms_addr;
-   a.erank = 0;
    return a;  
  }
  
@@@ -2238,8 -2279,8 +2235,8 @@@ void SimpleMessenger::submit_message(Me
    lock.Lock();
    {
      // local?
-     if (ms_addr.is_local_to(dest_addr)) {
 -    if (rank_addr == dest_addr) {
 -      if (local_endpoint) {
++    if (ms_addr == dest_addr) {
 +      if (dest_addr.get_erank() == 0 && !destination_stopped) {
          // local
          dout(20) << "submit_message " << *m << " local" << dendl;
        dispatch_queue.local_delivery(m, m->get_priority());
@@@ -2293,7 -2334,7 +2290,7 @@@ int SimpleMessenger::send_keepalive(con
    lock.Lock();
    {
      // local?
-     if (!ms_addr.is_local_to(dest_addr)) {
 -    if (rank_addr != dest_addr) {
++    if (ms_addr != dest_addr) {
        // remote.
        Pipe *pipe = 0;
        if (rank_pipe.count( dest_proc_addr )) {