Rev 580: ensure killtcp structure is initialised in
http://samba.org/~tridge/ctdb
tridge at samba.org
tridge at samba.org
Fri Jul 13 01:56:00 GMT 2007
------------------------------------------------------------
revno: 580
revision-id: tridge at samba.org-20070713015558-e64j98erir39vx29
parent: tridge at samba.org-20070713013118-tc4gxjsqihdzepir
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Fri 2007-07-13 11:55:58 +1000
message:
ensure killtcp structure is initialised
modified:
server/ctdb_takeover.c ctdb_takeover.c-20070525071636-a5n1ihghjtppy08r-2
=== modified file 'server/ctdb_takeover.c'
--- a/server/ctdb_takeover.c 2007-07-13 01:31:18 +0000
+++ b/server/ctdb_takeover.c 2007-07-13 01:55:58 +0000
@@ -908,7 +908,8 @@
}
-/* called every second until all sentenced connections have been reset
+/*
+ called every second until all sentenced connections have been reset
*/
static void ctdb_tickle_sentenced_connections(struct event_context *ev, struct timed_event *te,
struct timeval t, void *private_data)
@@ -976,7 +977,7 @@
a new structure
*/
if (killtcp == NULL) {
- killtcp = talloc(ctdb, struct ctdb_kill_tcp);
+ killtcp = talloc_zero(ctdb, struct ctdb_kill_tcp);
CTDB_NO_MEMORY(ctdb, killtcp);
killtcp->ctdb = ctdb;
@@ -1027,7 +1028,7 @@
/* We also need to set up some events to tickle all these connections
until they are all reset
*/
- event_add_timed(ctdb->ev, killtcp, timeval_current_ofs(0, 0),
+ event_add_timed(ctdb->ev, killtcp, timeval_zero(),
ctdb_tickle_sentenced_connections, killtcp);
}
More information about the samba-cvs
mailing list