From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Fri, 27 Apr 2007 15:19:40 +0000 (+1000)
Subject: clients should not fill in "generation" nor be aware of what generation
X-Git-Tag: tevent-0.9.20~348^2~2824^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d670cbf7449e7e00cf5c33d4ece4449ba2d8dee;p=thirdparty%2Fsamba.git

clients should not fill in "generation" nor be aware of what generation
the cluster is currently in.

remove all instances where the clients try to fill in the generation
field of the header

(This used to be ctdb commit fd75463f69f9f9100b2fe4cb710201a8262cdcec)
---

diff --git a/ctdb/common/ctdb_client.c b/ctdb/common/ctdb_client.c
index b0fcfd28a6c..5bfe0ff552d 100644
--- a/ctdb/common/ctdb_client.c
+++ b/ctdb/common/ctdb_client.c
@@ -334,7 +334,6 @@ struct ctdb_client_call_state *ctdb_call_send(struct ctdb_db_context *ctdb_db,
 	c->hdr.ctdb_magic = CTDB_MAGIC;
 	c->hdr.ctdb_version = CTDB_VERSION;
 	c->hdr.operation = CTDB_REQ_CALL;
-	c->hdr.generation= ctdb->vnn_map->generation;
 	/* this limits us to 16k outstanding messages - not unreasonable */
 	c->hdr.reqid     = ctdb_reqid_new(ctdb, state);
 	c->flags         = call->flags;
@@ -395,7 +394,6 @@ int ctdb_set_message_handler(struct ctdb_context *ctdb, uint64_t srvid,
 	c.hdr.length       = sizeof(c);
 	c.hdr.ctdb_magic   = CTDB_MAGIC;
 	c.hdr.ctdb_version = CTDB_VERSION;
-	c.hdr.generation   = ctdb->vnn_map->generation;
 	c.hdr.operation    = CTDB_REQ_REGISTER;
 	c.srvid            = srvid;
 
@@ -426,7 +424,6 @@ int ctdb_send_message(struct ctdb_context *ctdb, uint32_t vnn,
 	r->hdr.length    = len;
 	r->hdr.ctdb_magic = CTDB_MAGIC;
 	r->hdr.ctdb_version = CTDB_VERSION;
-	r->hdr.generation= ctdb->vnn_map->generation;
 	r->hdr.operation = CTDB_REQ_MESSAGE;
 	r->hdr.destnode  = vnn;
 	r->hdr.srcnode   = ctdb->vnn;
@@ -613,7 +610,6 @@ void ctdb_shutdown(struct ctdb_context *ctdb)
 	r.hdr.length       = len;
 	r.hdr.ctdb_magic   = CTDB_MAGIC;
 	r.hdr.ctdb_version = CTDB_VERSION;
-	r.hdr.generation   = ctdb->vnn_map->generation;
 	r.hdr.operation    = CTDB_REQ_SHUTDOWN;
 	r.hdr.reqid        = 0;
 
@@ -697,7 +693,6 @@ int ctdb_control(struct ctdb_context *ctdb, uint32_t destnode, uint64_t srvid,
 	c->hdr.length       = len;
 	c->hdr.ctdb_magic   = CTDB_MAGIC;
 	c->hdr.ctdb_version = CTDB_VERSION;
-	c->hdr.generation   = ctdb->vnn_map->generation;
 	c->hdr.operation    = CTDB_REQ_CONTROL;
 	c->hdr.reqid        = state->reqid;
 	c->hdr.destnode     = destnode;