ctdb-ib: Fix build errors for infiniband transport

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Wed Nov 13 13:31:10 UTC 2019 on sn-devel-184

diff --git a/ctdb/ib/ibwrapper.c b/ctdb/ib/ibwrapper.c
index 5ca3b946f00f371bd8a6a0cd4eadcfe09fa14d9b..cf4efa579e2ee93bbc0a28e5e45e04c411a288fc 100644 (file)
--- a/ctdb/ib/ibwrapper.c
+++ b/ctdb/ib/ibwrapper.c
@@ -32,7 +32,6 @@
 
 #include "common/logging.h"
 
-#include <infiniband/kern-abi.h>
 #include <rdma/rdma_cma_abi.h>
 #include <rdma/rdma_cma.h>
 

diff --git a/ctdb/ib/ibwrapper_test.c b/ctdb/ib/ibwrapper_test.c
index 5eb3209b68c24f91dfefc25187592c67a8ee2edd..77a5323fbf1ed6dca0f28fabc52fb308d09f6c6a 100644 (file)
--- a/ctdb/ib/ibwrapper_test.c
+++ b/ctdb/ib/ibwrapper_test.c
@@ -551,7 +551,7 @@ int main(int argc, char *argv[])
        memset(tcx, 0, sizeof(struct ibwtest_ctx));
        tcx->nsec = 0;
        tcx->nmsg = 1000;
-       DEBUGLEVEL = 0;
+       debuglevel_set(0);
 
        /* here is the only case we can't avoid using global... */
        testctx = tcx;
@@ -590,7 +590,7 @@ int main(int argc, char *argv[])
                        tcx->maxsize = (unsigned int)atoi(optarg);
                        break;
                case 'd':
-                       DEBUGLEVEL = atoi(optarg);
+                       debuglevel_set(atoi(optarg));
                        break;
                default:
                        fprintf(stderr, "ERROR: unknown option -%c\n", (char)op);