Skip to content
This repository has been archived by the owner on Feb 21, 2024. It is now read-only.

Commit

Permalink
ctdb-ib: Fix DEBUG log messages
Browse files Browse the repository at this point in the history 
https://bugzilla.samba.org/show_bug.cgi?id=12137

Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Uri Simchoni <[email protected]>
  • Loading branch information
@amitay @urisimchoni
amitay authored and urisimchoni committed Aug 10, 2016
1 parent f1a8fb1 commit c0246b4
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions ctdb/ib/ibwrapper.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ static int ibw_refill_cq_recv(struct ibw_conn *conn)
rc = ibv_post_recv(pconn->cm_id->qp, &wr, &bad_wr);
if (rc) {
sprintf(ibw_lasterr, "refill/ibv_post_recv failed with %d\n", rc);
DEBUG(DEBUG_ERR, (ibw_lasterr));
DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
return -2;
}

Expand Down Expand Up @@ -374,7 +374,7 @@ static int ibw_fill_cq(struct ibw_conn *conn)
rc = ibv_post_recv(pconn->cm_id->qp, &wr, &bad_wr);
if (rc) {
sprintf(ibw_lasterr, "fill/ibv_post_recv failed with %d\n", rc);
DEBUG(DEBUG_ERR, (ibw_lasterr));
DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
return -2;
}
}
Expand Down Expand Up @@ -651,7 +651,7 @@ static void ibw_event_handler_verbs(struct tevent_context *ev,
error:
ibv_ack_cq_events(pconn->cq, 1);

DEBUG(DEBUG_ERR, (ibw_lasterr));
DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));

if (conn->state!=IBWC_ERROR) {
conn->state = IBWC_ERROR;
Expand Down Expand Up @@ -991,7 +991,7 @@ struct ibw_ctx *ibw_init(struct ibw_initattr *attr, int nattr,
return ctx;
/* don't put code here */
cleanup:
DEBUG(DEBUG_ERR, (ibw_lasterr));
DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));

if (ctx)
talloc_free(ctx);
Expand Down Expand Up @@ -1029,7 +1029,7 @@ int ibw_bind(struct ibw_ctx *ctx, struct sockaddr_in *my_addr)
rc = rdma_bind_addr(pctx->cm_id, (struct sockaddr *) my_addr);
if (rc) {
sprintf(ibw_lasterr, "rdma_bind_addr error %d\n", rc);
DEBUG(DEBUG_ERR, (ibw_lasterr));
DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
return rc;
}
DEBUG(DEBUG_DEBUG, ("rdma_bind_addr successful\n"));
Expand All @@ -1046,7 +1046,7 @@ int ibw_listen(struct ibw_ctx *ctx, int backlog)
rc = rdma_listen(pctx->cm_id, backlog);
if (rc) {
sprintf(ibw_lasterr, "rdma_listen failed: %d\n", rc);
DEBUG(DEBUG_ERR, (ibw_lasterr));
DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
return rc;
}

Expand All @@ -1068,7 +1068,7 @@ int ibw_accept(struct ibw_ctx *ctx, struct ibw_conn *conn, void *conn_userdata)
rc = rdma_accept(pconn->cm_id, &conn_param);
if (rc) {
sprintf(ibw_lasterr, "rdma_accept failed %d\n", rc);
DEBUG(DEBUG_ERR, (ibw_lasterr));
DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
return -1;;
}

Expand Down Expand Up @@ -1115,7 +1115,7 @@ int ibw_connect(struct ibw_conn *conn, struct sockaddr_in *serv_addr, void *conn
rc = rdma_resolve_addr(pconn->cm_id, NULL, (struct sockaddr *) serv_addr, 2000);
if (rc) {
sprintf(ibw_lasterr, "rdma_resolve_addr error %d\n", rc);
DEBUG(DEBUG_ERR, (ibw_lasterr));
DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
talloc_free(conn);
return -1;
}
Expand All @@ -1142,7 +1142,7 @@ int ibw_disconnect(struct ibw_conn *conn)
rc = rdma_disconnect(pconn->cm_id);
if (rc) {
sprintf(ibw_lasterr, "ibw_disconnect failed with %d\n", rc);
DEBUG(DEBUG_ERR, (ibw_lasterr));
DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
return rc;
}
break;
Expand Down Expand Up @@ -1280,7 +1280,7 @@ static int ibw_send_packet(struct ibw_conn *conn, void *buf, struct ibw_wr *p, u

return 0;
error:
DEBUG(DEBUG_ERR, (ibw_lasterr));
DEBUG(DEBUG_ERR, ("%s", ibw_lasterr));
return -1;
}

Expand Down

0 comments on commit c0246b4

Please sign in to comment.