sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

merge fixes from samba4

Browse Source 
(This used to be ctdb commit 23d892c2696c5c1dd9f12f1ccd1acfa264be4fb6)
This commit is contained in:
Andrew Tridgell 2007-04-21 13:08:22 +10:00
parent 5afe9b709c
commit 3fb0fa97b3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/common/ctdb_daemon.c
View File

@ -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);
}

2
ctdb/common/ctdb_lockwait.c
View File

@ -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 {

4
ctdb/config.mk
View File

@ -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