Merge branch 'xio-rename_XioRsp' of https://github.com/Adirl/ceph into Adirl-xio...

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

diff --cc src/msg/xio/XioConnection.cc
Simple merge

diff --cc src/msg/xio/XioMsg.cc
index 1b7d196fe2ab28c6a0d14b9b4c1762d386fdbae7,2e7e4fabb4a811e9bb0f6fb4c481334ef03d812c..ef0ab6f5a8b3bda9dc918d822097b77703775c5e
--- 1/src/msg/xio/XioMsg.cc
--- 2/src/msg/xio/XioMsg.cc
+++ b/src/msg/xio/XioMsg.cc
@@@ -25,11 -25,11 +25,11 @@@ int XioDispatchHook::release_msgs(
    cl_flag = true;
  
    /* queue for release */
-   xrsp = static_cast<XioRsp *>(rsp_pool.alloc(sizeof(XioRsp)));
-   new (xrsp) XioRsp(xcon, this);
+   xcmp = static_cast<XioCompletion *>(rsp_pool.alloc(sizeof(XioCompletion)));
+   new (xcmp) XioCompletion(xcon, this);
  
    /* merge with portal traffic */
-   xcon->portal->enqueue(xcon, xrsp);
 -  xcon->portal->enqueue_for_send(xcon, xcmp);
++  xcon->portal->enqueue(xcon, xcmp);
  
    assert(r);
    return r;

diff --cc src/msg/xio/XioMsg.h
Simple merge

diff --cc src/msg/xio/XioPortal.h
index 16dc18592ae0855c89f5cdf340a6002b33176f2f,aaf0860f2d0f23427b145c07852f834820ce2d72..bbe31ff2b7b953c5b3e737cf3c4c55a944b8698e
--- 1/src/msg/xio/XioPortal.h
--- 2/src/msg/xio/XioPortal.h
+++ b/src/msg/xio/XioPortal.h
@@@ -167,13 -169,13 +167,13 @@@ public
        next_msg = static_cast<struct xio_msg *>(msg->user_context);
        code = xio_release_msg(msg);
        if (unlikely(code)) /* very unlikely, so log it */
-       xrsp->xcon->msg_release_fail(msg, code);
+       xcmp->xcon->msg_release_fail(msg, code);
        msg = next_msg;
      }
-     xrsp->finalize(); /* unconditional finalize */
+     xcmp->finalize(); /* unconditional finalize */
    }
  
 -  void enqueue_for_send(XioConnection *xcon, XioSubmit *xs)
 +  void enqueue(XioConnection *xcon, XioSubmit *xs)
      {
        if (! _shutdown) {
        submit_q.enq(xcon, xs);