From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 21 Apr 2007 03:08:22 +0000 (+1000)
Subject: merge fixes from samba4
X-Git-Tag: tevent-0.9.20~348^2~2858
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3fb0fa97b3807335560665e1fb43793c318478df;p=thirdparty%2Fsamba.git

merge fixes from samba4
(This used to be ctdb commit 23d892c2696c5c1dd9f12f1ccd1acfa264be4fb6)
---

diff --git a/ctdb/common/ctdb_daemon.c b/ctdb/common/ctdb_daemon.c
index d2721a0ae52..ff3431a392d 100644
--- a/ctdb/common/ctdb_daemon.c
+++ b/ctdb/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/ctdb/common/ctdb_lockwait.c b/ctdb/common/ctdb_lockwait.c
index 5381d4924b7..36b08796bef 100644
--- a/ctdb/common/ctdb_lockwait.c
+++ b/ctdb/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/ctdb/config.mk b/ctdb/config.mk
index a16b7b29919..076562297f5 100644
--- a/ctdb/config.mk
+++ b/ctdb/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