ctdb-transport: Replace ctdb_logging.h with common/logging.h

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/ctdb/ib/ibw_ctdb.c b/ctdb/ib/ibw_ctdb.c
index 3e17a70778302ce619cefe157d1b4b9dde4d122d..458646faae0904265101900472c8fcfb9dc89864 100644 (file)
--- a/ctdb/ib/ibw_ctdb.c
+++ b/ctdb/ib/ibw_ctdb.c
@@ -30,10 +30,10 @@
 #include "lib/util/time.h"
 #include "lib/util/debug.h"
 
-#include "ctdb_logging.h"
 #include "ctdb_private.h"
 
 #include "common/common.h"
+#include "common/logging.h"
 
 #include "ibwrapper.h"
 #include "ibw_ctdb.h"

diff --git a/ctdb/ib/ibw_ctdb_init.c b/ctdb/ib/ibw_ctdb_init.c
index 2c5a6c056a58c2271f1e7386d6f2ba808977cf64..7e77ec08031a4c6cbfd94a48d1b404f811913d88 100644 (file)
--- a/ctdb/ib/ibw_ctdb_init.c
+++ b/ctdb/ib/ibw_ctdb_init.c
@@ -30,10 +30,10 @@
 #include "lib/util/dlinklist.h"
 #include "lib/util/debug.h"
 
-#include "ctdb_logging.h"
 #include "ctdb_private.h"
 
 #include "common/common.h"
+#include "common/logging.h"
 
 #include "ibwrapper.h"
 #include "ibw_ctdb.h"

diff --git a/ctdb/ib/ibwrapper.c b/ctdb/ib/ibwrapper.c
index ad97fda4aa8bb3e520b875cc639e696e1d61e851..b10aaf562f5bdbea99a2bfa2d086ce0ed4a5413c 100644 (file)
--- a/ctdb/ib/ibwrapper.c
+++ b/ctdb/ib/ibwrapper.c
@@ -30,7 +30,7 @@
 #include "lib/util/dlinklist.h"
 #include "lib/util/debug.h"
 
-#include "ctdb_logging.h"
+#include "common/logging.h"
 
 #include <infiniband/kern-abi.h>
 #include <rdma/rdma_cma_abi.h>

diff --git a/ctdb/ib/ibwrapper_test.c b/ctdb/ib/ibwrapper_test.c
index 537df915eaa35867c8952b86fda568f569fa00bf..eaa14fb4e43a4e24465af9199771de89442aa742 100644 (file)
--- a/ctdb/ib/ibwrapper_test.c
+++ b/ctdb/ib/ibwrapper_test.c
@@ -31,7 +31,7 @@
 #include "lib/util/time.h"
 #include "lib/util/debug.h"
 
-#include "ctdb_logging.h"
+#include "common/logging.h"
 
 #include "ib/ibwrapper.h"
 

diff --git a/ctdb/tcp/tcp_connect.c b/ctdb/tcp/tcp_connect.c
index 0fee1acb22ebb4118bb0ec276aad620ce8be815b..fbb17c8ab09d6c62284814c2c1f3745de62d750d 100644 (file)
--- a/ctdb/tcp/tcp_connect.c
+++ b/ctdb/tcp/tcp_connect.c
@@ -28,11 +28,11 @@
 #include "lib/util/debug.h"
 #include "lib/util/time.h"
 
-#include "ctdb_logging.h"
 #include "ctdb_private.h"
 
 #include "common/system.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 #include "ctdb_tcp.h"
 

diff --git a/ctdb/tcp/tcp_init.c b/ctdb/tcp/tcp_init.c
index c1791e08813baf951d087d53246268c75c72f97d..b6083666e18a591b3e58c8b720d374250bbd33d2 100644 (file)
--- a/ctdb/tcp/tcp_init.c
+++ b/ctdb/tcp/tcp_init.c
@@ -27,10 +27,10 @@
 #include "lib/util/time.h"
 #include "lib/util/debug.h"
 
-#include "ctdb_logging.h"
 #include "ctdb_private.h"
 
 #include "common/common.h"
+#include "common/logging.h"
 
 #include "ctdb_tcp.h"
 

diff --git a/ctdb/tcp/tcp_io.c b/ctdb/tcp/tcp_io.c
index 210881988ee89598c5914101b9b075d750e05197..5bb4b5bd1a7bdd54425f599a824f62345d8bc3a6 100644 (file)
--- a/ctdb/tcp/tcp_io.c
+++ b/ctdb/tcp/tcp_io.c
@@ -24,10 +24,10 @@
 #include "lib/util/dlinklist.h"
 #include "lib/util/debug.h"
 
-#include "ctdb_logging.h"
 #include "ctdb_private.h"
 
 #include "common/common.h"
+#include "common/logging.h"
 
 #include "ctdb_tcp.h"