[SCM] CTDB repository - branch master updated - ctdb-1.0.114-153-g9b4a83e

[Ronnie Sahlberg]

The branch, master has been updated
       via  9b4a83e49c5df80df8498b7384c5f53f390c1d9d (commit)
      from  5c0fea90c6474a51992a9c4aeb6af7dfeb213ee0 (commit)

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


- Log -----------------------------------------------------------------
commit 9b4a83e49c5df80df8498b7384c5f53f390c1d9d
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Jun 9 15:12:26 2010 +1000

    We can not be holding a chainlock at this stage, so the tdb_chainunlock() call is bogus
    
    ( a child process might be holding the lock, but not the main daemon)

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

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


Changeset truncated at 500 lines:

diff --git a/server/ctdb_ltdb_server.c b/server/ctdb_ltdb_server.c
index 1ce7283..03c62ac 100644
--- a/server/ctdb_ltdb_server.c
+++ b/server/ctdb_ltdb_server.c
@@ -141,7 +141,6 @@ int ctdb_ltdb_lock_requeue(struct ctdb_db_context *ctdb_db,
 	/* now the contended path */
 	h = ctdb_lockwait(ctdb_db, key, lock_fetch_callback, state);
 	if (h == NULL) {
-		tdb_chainunlock(tdb, key);
 		return -1;
 	}
 


-- 
CTDB repository