Rev 173: merge fixes from samba4 in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 173
revision-id: tridge at samba.org-20070421030822-6af160dfe70a87e4
parent: tridge at samba.org-20070421030749-d1645f913f7f2f58
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Sat 2007-04-21 13:08:22 +1000
message:
  merge fixes from samba4
modified:
  common/ctdb_daemon.c           ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
  common/ctdb_lockwait.c         ctdb_lockwait.c-20070416214118-n1aeonljj3vpdd9q-1
  config.mk                      config.mk-20070416041303-xql6zaaq90w8kovl-1
=== modified file 'common/ctdb_daemon.c'
--- a/common/ctdb_daemon.c	2007-04-20 11:02:53 +0000
+++ b/common/ctdb_daemon.c	2007-04-21 03:08:22 +0000
@@ -338,9 +338,9 @@
 	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);
 }
 
 

=== modified file 'common/ctdb_lockwait.c'
--- a/common/ctdb_lockwait.c	2007-04-20 11:02:53 +0000
+++ b/common/ctdb_lockwait.c	2007-04-21 03:08:22 +0000
@@ -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 {

=== modified file 'config.mk'
--- a/config.mk	2007-04-16 06:01:37 +0000
+++ b/config.mk	2007-04-21 03:08:22 +0000
@@ -15,7 +15,6 @@
 
 ##################
 [SUBSYSTEM::ctdb]
-INIT_FUNCTION = server_service_ctdbd_init
 OBJ_FILES = \
 		ctdb_cluster.o \
 		common/ctdb.o \
@@ -25,6 +24,7 @@
 		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