From: Amitay Isaacs <amitay@gmail.com>
Date: Fri, 26 Feb 2016 04:42:53 +0000 (+1100)
Subject: ctdb-recovery-helper: Rename pnn to dmaster in recdb_records()
X-Git-Tag: tdb-1.3.9~111
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70011a1bfb24d9f4b2a042d353f907ef7c49bc1c;p=thirdparty%2Fsamba.git

ctdb-recovery-helper: Rename pnn to dmaster in recdb_records()

This variable is used to set the dmaster value for each record in
recdb_traverse().

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
---

diff --git a/ctdb/server/ctdb_recovery_helper.c b/ctdb/server/ctdb_recovery_helper.c
index 5f93d206b42..857a838bf4c 100644
--- a/ctdb/server/ctdb_recovery_helper.c
+++ b/ctdb/server/ctdb_recovery_helper.c
@@ -203,7 +203,7 @@ static bool recdb_add(struct recdb_context *recdb, int mypnn,
 
 struct recdb_traverse_state {
 	struct ctdb_rec_buffer *recbuf;
-	uint32_t pnn;
+	uint32_t dmaster;
 	uint32_t reqid;
 	bool persistent;
 	bool failed;
@@ -255,7 +255,7 @@ static int recdb_traverse(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
 	/* update the dmaster field to point to us */
 	header = (struct ctdb_ltdb_header *)data.dptr;
 	if (!state->persistent) {
-		header->dmaster = state->pnn;
+		header->dmaster = state->dmaster;
 		header->flags |= CTDB_REC_FLAG_MIGRATED_WITH_DATA;
 	}
 
@@ -270,7 +270,8 @@ static int recdb_traverse(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
 }
 
 static struct ctdb_rec_buffer *recdb_records(struct recdb_context *recdb,
-					     TALLOC_CTX *mem_ctx, uint32_t pnn)
+					     TALLOC_CTX *mem_ctx,
+					     uint32_t dmaster)
 {
 	struct recdb_traverse_state state;
 	int ret;
@@ -279,7 +280,7 @@ static struct ctdb_rec_buffer *recdb_records(struct recdb_context *recdb,
 	if (state.recbuf == NULL) {
 		return NULL;
 	}
-	state.pnn = pnn;
+	state.dmaster = dmaster;
 	state.reqid = 0;
 	state.persistent = recdb->persistent;
 	state.failed = false;