From: Haomai Wang <haomaiwang@gmail.com>
Date: Tue, 11 Apr 2017 01:13:03 +0000 (+0800)
Subject: Merge pull request #13940 from Adirl/out
X-Git-Tag: v12.0.2~117
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5da652e1d9a2ad2219f94256f2728840aa30f8ed;p=ceph.git

Merge pull request #13940 from Adirl/out

msg/async/rdma: Update fix broken compilation

Reviewed-by: Haomai Wang <haomai@xsky.com>
---

5da652e1d9a2ad2219f94256f2728840aa30f8ed
diff --cc src/msg/async/rdma/RDMAServerSocketImpl.cc
index 1c5f170b4d0f,8f5fd81d3dc7..a9665d96edf0
--- a/src/msg/async/rdma/RDMAServerSocketImpl.cc
+++ b/src/msg/async/rdma/RDMAServerSocketImpl.cc
@@@ -110,12 -96,16 +110,16 @@@ int RDMAServerConnTCP::accept(Connected
      ::close(sd);
      return -errno;
    }
+ 
+   assert(NULL != out); //out should not be NULL in accept connection
+ 
+   out->set_sockaddr((sockaddr*)&ss);
    net.set_priority(sd, opt.priority, out->get_family());
  
 -  RDMAConnectedSocketImpl* server;
 +  RDMAConnectedSocketImpl *server;
    //Worker* w = dispatcher->get_stack()->get_worker();
 -  server = new RDMAConnectedSocketImpl(cct, infiniband, dispatcher, dynamic_cast<RDMAWorker*>(w));
 -  server->set_accept_fd(sd);
 +  RDMAConnTCPInfo conn_info = { sd };
 +  server = new RDMAConnectedSocketImpl(cct, infiniband, dispatcher, dynamic_cast<RDMAWorker*>(w), &conn_info);
    ldout(cct, 20) << __func__ << " accepted a new QP, tcp_fd: " << sd << dendl;
    std::unique_ptr<RDMAConnectedSocketImpl> csi(server);
    *sock = ConnectedSocket(std::move(csi));