[SCM] CTDB repository - branch master updated - ctdb-1.12-100-gfaf25e8

[Michael Adam]

The branch, master has been updated
       via  faf25e8a2fdf80a016048e1f698a014ceb5e604f (commit)
       via  f60de23e0a8307b5baaa9c4b8406b2b223487a48 (commit)
      from  57fb074a65dc56168fc3813b79a5bab4b3727cf3 (commit)

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


- Log -----------------------------------------------------------------
commit faf25e8a2fdf80a016048e1f698a014ceb5e604f
Author: Michael Adam <obnox at samba.org>
Date:   Tue Dec 6 10:38:04 2011 +0100

    libctdb: fix libctdb's traverse after changes in the core
    
    In 8281bb210858ed04992eacea7f6d02261e0fc1b1, I forgot to change
    this hunk back when hiding the wire changes done in commit
    ddc5da3a0df7701934404192a0a0aa659a806acb behind a new control
    CTDB_CONTROL_TRAVERSE_START_EXT.

commit f60de23e0a8307b5baaa9c4b8406b2b223487a48
Author: Michael Adam <obnox at samba.org>
Date:   Tue Dec 6 10:42:43 2011 +0100

    Revert "Fix the build that broke in 8281bb210858ed04992eacea7f6d02261e0fc1b1"
    
    This reverts commit 08e06176feab1ec244496e62a916fbb77817239f.
    
    I wanted to fix this differently, not using the extended traverse_start
    control...

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

Summary of changes:
 libctdb/ctdb.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libctdb/ctdb.c b/libctdb/ctdb.c
index 0c5a1b3..2f694a1 100644
--- a/libctdb/ctdb.c
+++ b/libctdb/ctdb.c
@@ -1106,7 +1106,7 @@ static void traverse_msghnd_cb(struct ctdb_connection *ctdb,
 {
 	struct ctdb_traverse_state *state = private_data;
 	struct ctdb_db *ctdb_db = state->ctdb_db;
-	struct ctdb_traverse_start_ext t;
+	struct ctdb_traverse_start t;
 
 	if (!ctdb_set_message_handler_recv(ctdb, state->handle)) {
 		DEBUG(ctdb, LOG_ERR,
@@ -1127,10 +1127,9 @@ static void traverse_msghnd_cb(struct ctdb_connection *ctdb,
 	t.db_id = ctdb_db->id;
 	t.srvid = state->srvid;
 	t.reqid = 0;
-	t.withemptyrecords = false;
 
 	state->handle = new_ctdb_control_request(ctdb,
-				CTDB_CONTROL_TRAVERSE_START_EXT,
+				CTDB_CONTROL_TRAVERSE_START,
 				CTDB_CURRENT_NODE,
 				&t, sizeof(t),
 				traverse_start_cb, state);


-- 
CTDB repository