[SCM] Samba Shared Repository - branch master updated

[Martin Schwenke]

The branch, master has been updated
       via  816205027a1 ctdb-ib: Fix build errors for infiniband transport
      from  86e418f992e build: Refuse to build if ADDITIONAL_LDFLAGS or ADDITIONAL_CFLAGS do not work

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 816205027a12d16b5de7c1fd78b4bed468a94fbb
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Tue Nov 12 14:14:53 2019 +1100

    ctdb-ib: Fix build errors for infiniband transport
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    
    Autobuild-User(master): Martin Schwenke <martins at samba.org>
    Autobuild-Date(master): Wed Nov 13 13:31:10 UTC 2019 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 ctdb/ib/ibwrapper.c      | 1 -
 ctdb/ib/ibwrapper_test.c | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/ib/ibwrapper.c b/ctdb/ib/ibwrapper.c
index 5ca3b946f00..cf4efa579e2 100644
--- 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 5eb3209b68c..77a5323fbf1 100644
--- 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);


-- 
Samba Shared Repository