[SCM] CTDB repository - branch master updated - ctdb-1.10-174-g2fd27bd

[Ronnie Sahlberg]

The branch, master has been updated
       via  2fd27bdedb1e0d6558c07e1b74fc8e70ddf593dc (commit)
      from  89f8169c24da96c1fdd0ac19b8a1e0e1df01a72a (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2fd27bdedb1e0d6558c07e1b74fc8e70ddf593dc
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Mar 16 14:55:58 2011 +1100

    Deferred attach: create the timed event as a child context of the da context we want to delete.
    Othwervise the da context can be timed out and talloc_free()d
    but the event for this already freed object will still trigger,
    causing a talloc error and shutdown.
    
    CQ S1022515

-----------------------------------------------------------------------

Summary of changes:
 server/ctdb_ltdb_server.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/ctdb_ltdb_server.c b/server/ctdb_ltdb_server.c
index fe061e7..a93e2fa 100644
--- a/server/ctdb_ltdb_server.c
+++ b/server/ctdb_ltdb_server.c
@@ -990,7 +990,7 @@ int ctdb_process_deferred_attach(struct ctdb_context *ctdb)
 	 */
 	while ((da_ctx = ctdb->deferred_attach) != NULL) {
 		DLIST_REMOVE(ctdb->deferred_attach, da_ctx);
-		event_add_timed(ctdb->ev, ctdb, timeval_current_ofs(1,0), ctdb_deferred_attach_callback, da_ctx);
+		event_add_timed(ctdb->ev, da_ctx, timeval_current_ofs(1,0), ctdb_deferred_attach_callback, da_ctx);
 	}
 
 	return 0;


-- 
CTDB repository