sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Make KILLTCP structure a child of VNN so that it is freed at the same time

Browse Source 
the referenced VNN structure is.

Also, remove the circular reference between the two objects KIPPCTP and VNN

(This used to be ctdb commit 02b62482164a3c69715949074feb7f191a29d534)
This commit is contained in:
Ronnie Sahlberg 2012-02-27 07:18:19 +11:00
parent 93ec9c589c
commit 91c9371f2d
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ctdb/server/ctdb_takeover.c
View File

@ -2934,9 +2934,25 @@ static void ctdb_tickle_sentenced_connections(struct event_context *ev, struct t
*/
static int ctdb_killtcp_destructor(struct ctdb_kill_tcp *killtcp)
{
if (killtcp->vnn) {
killtcp->vnn->killtcp = NULL;
struct ctdb_vnn *tmpvnn;
/* verify that this vnn is still active */
for (tmpvnn = killtcp->ctdb->vnn; tmpvnn; tmpvnn = tmpvnn->next) {
if (tmpvnn == killtcp->vnn) {
break;
}
}
if (tmpvnn == NULL) {
return 0;
}
if (killtcp->vnn->killtcp != killtcp) {
return 0;
}
killtcp->vnn->killtcp = NULL;
return 0;
}
@ -2991,7 +3007,7 @@ static int ctdb_killtcp_add_connection(struct ctdb_context *ctdb,
a new structure
*/
if (killtcp == NULL) {
killtcp = talloc_zero(ctdb, struct ctdb_kill_tcp);
killtcp = talloc_zero(vnn, struct ctdb_kill_tcp);
CTDB_NO_MEMORY(ctdb, killtcp);
killtcp->vnn = vnn;