RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 00:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

xio: fix compilation against latest accelio

Browse Source 
Do not use C struct initilization style to avoid eclipse errors.
We also don't use c++ struct initalize as members are not specified
and it just happens that in latest accelio version one of the fields
has changed in the middle of the struct.

Signed-off-by: Roi Dayan <roid@mellanox.com>
This commit is contained in:
Roi Dayan 2016-02-14 11:45:22 +02:00
parent c49de8c1c2
commit f1743dbb0b
1 changed files with 9 additions and 19 deletions

28
src/msg/xio/XioMessenger.cc
View File

@ -965,15 +965,11 @@ ConnectionRef XioMessenger::get_connection(const entity_inst_t& dest)
<< xio_uri << dendl;
/* XXX client session creation parameters */
struct xio_session_params params = {
.type = XIO_SESSION_CLIENT,
.initial_sn = 0,
.ses_ops = &xio_msgr_ops,
.user_context = this,
.private_data = NULL,
.private_data_len = 0,
.uri = (char *)xio_uri.c_str()
};
struct xio_session_params params = {};
params.type = XIO_SESSION_CLIENT;
params.ses_ops = &xio_msgr_ops;
params.user_context = this;
params.uri = xio_uri.c_str();
XioConnection *xcon = new XioConnection(this, XioConnection::ACTIVE,
dest);
@ -986,16 +982,10 @@ ConnectionRef XioMessenger::get_connection(const entity_inst_t& dest)
/* this should cause callbacks with user context of conn, but
* we can always set it explicitly */
struct xio_connection_params xcp = {
.session = xcon->session,
.ctx = this->portals.get_portal0()->ctx,
.conn_idx = 0, /* XXX auto_count */
.enable_tos = 0,
.tos = 0,
.pad = 0,
.out_addr = NULL,
.conn_user_context = xcon
};
struct xio_connection_params xcp = {};
xcp.session = xcon->session;
xcp.ctx = this->portals.get_portal0()->ctx;
xcp.conn_user_context = xcon;
xcon->conn = xio_connect(&xcp);
if (!xcon->conn) {