ctdb-common: 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/common/ctdb_io.c b/ctdb/common/ctdb_io.c
index 632574ed7160cb091ec75ad1c67d2825f570b879..24968b3ac91b4a91d73fbb7adaca0cb501abf7ba 100644 (file)
--- a/ctdb/common/ctdb_io.c
+++ b/ctdb/common/ctdb_io.c
@@ -31,11 +31,11 @@
 #include "lib/util/dlinklist.h"
 #include "lib/util/debug.h"
 
-#include "ctdb_logging.h"
 #include "ctdb_private.h"
 #include "ctdb_client.h"
 
 #include "common/system.h"
+#include "common/logging.h"
 #include "common/common.h"
 
 #define QUEUE_BUFFER_SIZE      (16*1024)

diff --git a/ctdb/common/ctdb_ltdb.c b/ctdb/common/ctdb_ltdb.c
index 39775be706e527708513f0320af75ec111d2ea72..6c941d87e45624a2f0feebf47d56c7611d172421 100644 (file)
--- a/ctdb/common/ctdb_ltdb.c
+++ b/ctdb/common/ctdb_ltdb.c
@@ -28,10 +28,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"
 
 /*
   find an attached ctdb_db handle given a name

diff --git a/ctdb/common/ctdb_util.c b/ctdb/common/ctdb_util.c
index 209735c725640851f4a4ae914aed039d4a735e54..39108bcffb92f0db170a980330de145f595b7482 100644 (file)
--- a/ctdb/common/ctdb_util.c
+++ b/ctdb/common/ctdb_util.c
@@ -27,12 +27,12 @@
 #include "lib/util/debug.h"
 #include "lib/util/samba_util.h"
 
-#include "ctdb_logging.h"
 #include "ctdb_private.h"
 
 #include "common/reqid.h"
 #include "common/system.h"
 #include "common/common.h"
+#include "common/logging.h"
 
 /*
   return error string for last error

diff --git a/ctdb/common/rb_tree.c b/ctdb/common/rb_tree.c
index 6b0982f5d759dd7b5ede7072fff634be0fa1a42d..1c602a730b7bed39a9ea6c884e1fa2aeb77f7b6f 100644 (file)
--- a/ctdb/common/rb_tree.c
+++ b/ctdb/common/rb_tree.c
@@ -22,9 +22,9 @@
 #include <talloc.h>
 
 #include "lib/util/debug.h"
-#include "ctdb_logging.h"
 
-#include "rb_tree.h"
+#include "common/logging.h"
+#include "common/rb_tree.h"
 
 #define NO_MEMORY_FATAL(p) do { if (!(p)) { \
           DEBUG(DEBUG_CRIT,("Out of memory for %s at %s\n", #p, __location__)); \