merge from tridge

(This used to be ctdb commit fb8ac93c7dfc11e774ef1ce05b0d0df1de56a621)

diff --cc ctdb/common/ctdb_client.c
Simple merge

diff --cc ctdb/common/ctdb_control.c
Simple merge

diff --cc ctdb/include/ctdb_private.h
index 2c40cc8eb272c078f76db5a86e780cb5a45aa0ac,2be0a59bd97aad522e3dbc7467452a601d3ce66f..125f71d40ff423c03383fa2bbfafa6c63affb336
--- 1/ctdb/include/ctdb_private.h
--- 2/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@@ -655,6 -649,32 +659,33 @@@ int ctdb_control_getvnnmap(struct ctdb_
  int ctdb_control_setvnnmap(struct ctdb_context *ctdb, uint32_t opcode, TDB_DATA indata, TDB_DATA *outdata);
  int ctdb_control_getdbmap(struct ctdb_context *ctdb, uint32_t opcode, TDB_DATA indata, TDB_DATA *outdata);
  int ctdb_control_getnodemap(struct ctdb_context *ctdb, uint32_t opcode, TDB_DATA indata, TDB_DATA *outdata);
 +int ctdb_control_writerecord(struct ctdb_context *ctdb, uint32_t opcode, TDB_DATA indata, TDB_DATA *outdata);
  
+ 
+ struct ctdb_traverse_start {
+       uint32_t db_id;
+       uint32_t reqid;
+       uint64_t srvid;
+ };
+ 
+ /*
+   structure used to pass the data between the child and parent
+  */
+ struct ctdb_traverse_data {
+       uint32_t length;
+       uint32_t reqid;
+       uint32_t keylen;
+       uint32_t datalen;
+       uint8_t  data[1];
+ };
+                                  
+ 
+ int32_t ctdb_control_traverse_start(struct ctdb_context *ctdb, TDB_DATA indata, 
+                                   TDB_DATA *outdata, uint32_t srcnode);
+ int32_t ctdb_control_traverse_all(struct ctdb_context *ctdb, TDB_DATA data, TDB_DATA *outdata);
+ int32_t ctdb_control_traverse_data(struct ctdb_context *ctdb, TDB_DATA data, TDB_DATA *outdata);
+ 
+ int ctdb_dispatch_message(struct ctdb_context *ctdb, uint64_t srvid, TDB_DATA data);
+ 
+ 
  #endif