1 --- ctdb-2.1/ib/ibwrapper.c.orig 2013-01-20 07:41:57.623125096 +0100
2 +++ ctdb-2.1/ib/ibwrapper.c 2013-01-20 08:05:20.174450630 +0100
4 rc = ibv_post_recv(pconn->cm_id->qp, &wr, &bad_wr);
6 sprintf(ibw_lasterr, "refill/ibv_post_recv failed with %d\n", rc);
7 - DEBUG(DEBUG_ERR, (ibw_lasterr));
8 + DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
13 rc = ibv_post_recv(pconn->cm_id->qp, &wr, &bad_wr);
15 sprintf(ibw_lasterr, "fill/ibv_post_recv failed with %d\n", rc);
16 - DEBUG(DEBUG_ERR, (ibw_lasterr));
17 + DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
23 ibv_ack_cq_events(pconn->cq, 1);
25 - DEBUG(DEBUG_ERR, (ibw_lasterr));
26 + DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
28 if (conn->state!=IBWC_ERROR) {
29 conn->state = IBWC_ERROR;
32 /* don't put code here */
34 - DEBUG(DEBUG_ERR, (ibw_lasterr));
35 + DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
40 rc = rdma_bind_addr(pctx->cm_id, (struct sockaddr *) my_addr);
42 sprintf(ibw_lasterr, "rdma_bind_addr error %d\n", rc);
43 - DEBUG(DEBUG_ERR, (ibw_lasterr));
44 + DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
47 DEBUG(DEBUG_DEBUG, ("rdma_bind_addr successful\n"));
49 rc = rdma_listen(pctx->cm_id, backlog);
51 sprintf(ibw_lasterr, "rdma_listen failed: %d\n", rc);
52 - DEBUG(DEBUG_ERR, (ibw_lasterr));
53 + DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
58 rc = rdma_accept(pconn->cm_id, &conn_param);
60 sprintf(ibw_lasterr, "rdma_accept failed %d\n", rc);
61 - DEBUG(DEBUG_ERR, (ibw_lasterr));
62 + DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
67 rc = rdma_resolve_addr(pconn->cm_id, NULL, (struct sockaddr *) serv_addr, 2000);
69 sprintf(ibw_lasterr, "rdma_resolve_addr error %d\n", rc);
70 - DEBUG(DEBUG_ERR, (ibw_lasterr));
71 + DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
76 rc = rdma_disconnect(pconn->cm_id);
78 sprintf(ibw_lasterr, "ibw_disconnect failed with %d\n", rc);
79 - DEBUG(DEBUG_ERR, (ibw_lasterr));
80 + DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
88 - DEBUG(DEBUG_ERR, (ibw_lasterr));
89 + DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));