merge fixes from samba4

diff --git a/common/ctdb_daemon.c b/common/ctdb_daemon.c
index d2721a0ae525d5547ad7cac3aa945fe7cdcf1ae6..ff3431a392db60073d5048d0f96e529c14454b1f 100644 (file)
--- a/common/ctdb_daemon.c
+++ b/common/ctdb_daemon.c
@@ -338,9 +338,9 @@ static void daemon_call_from_client_callback(struct ctdb_call_state *state)
        if (res != 0) {
                DEBUG(0, (__location__ "Failed to queue packet from daemon to client\n"));
        }
+       ctdb_latency(&client->ctdb->status.max_call_latency, dstate->start_time);
        talloc_free(dstate);
        client->ctdb->status.pending_calls--;
-       ctdb_latency(&client->ctdb->status.max_call_latency, dstate->start_time);
 }
 
 

diff --git a/common/ctdb_lockwait.c b/common/ctdb_lockwait.c
index 5381d4924b7f50d63ad8903781f64eded078b91b..36b08796befe0d81b13d8bf69de04f90c7634b79 100644 (file)
--- a/common/ctdb_lockwait.c
+++ b/common/ctdb_lockwait.c
@@ -23,9 +23,9 @@
 #include "system/filesys.h"
 #include "system/wait.h"
 #include "popt.h"
-#include "../include/ctdb_private.h"
 #include "db_wrap.h"
 #include "lib/tdb/include/tdb.h"
+#include "../include/ctdb_private.h"
 
 
 struct lockwait_handle {

diff --git a/config.mk b/config.mk
index a16b7b2991949bd9093fd0ae556c27b11cb44074..076562297f513a13310d9c5dd0fd024d86c42da7 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -15,7 +15,6 @@ OBJ_FILES = \
 
 ##################
 [SUBSYSTEM::ctdb]
-INIT_FUNCTION = server_service_ctdbd_init
 OBJ_FILES = \
                ctdb_cluster.o \
                common/ctdb.o \
@@ -25,6 +24,7 @@ OBJ_FILES = \
                common/ctdb_util.o \
                common/ctdb_io.o \
                common/ctdb_client.o \
-               common/ctdb_daemon.o
+               common/ctdb_daemon.o \
+               common/ctdb_lockwait.o
 PUBLIC_DEPENDENCIES = LIBTDB LIBTALLOC
 PRIVATE_DEPENDENCIES = ctdb_tcp