From: Martin Schwenke <martin@meltin.net>
Date: Wed, 18 Apr 2018 00:51:26 +0000 (+1000)
Subject: ctdb-daemon: Drop duplicate initialisation of request ID context
X-Git-Tag: ldb-1.4.0~481
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b574876753a2a76acefeed0a0268dad2c9db293;p=thirdparty%2Fsamba.git

ctdb-daemon: Drop duplicate initialisation of request ID context

This doesn't require configuration options so keep the instance in
ctdb_init().

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

diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c
index 2046f7a55bc..20f82d771f2 100644
--- a/ctdb/server/ctdbd.c
+++ b/ctdb/server/ctdbd.c
@@ -106,6 +106,7 @@ static struct ctdb_context *ctdb_init(struct tevent_context *ev)
 		return NULL;
 	}
 	ctdb->ev  = ev;
+
 	/* Wrap early to exercise code. */
 	ret = reqid_init(ctdb, INT_MAX-200, &ctdb->idr);
 	if (ret != 0) {
@@ -259,13 +260,6 @@ int main(int argc, const char *argv[])
 	}
 	ctdb->recovery_lock = options.recovery_lock;
 
-	TALLOC_FREE(ctdb->idr);
-	ret = reqid_init(ctdb, 0, &ctdb->idr);;
-	if (ret != 0) {
-		DEBUG(DEBUG_ERR, ("reqid_init failed (%s)\n", strerror(ret)));
-		exit(1);
-	}
-
 	ctdb_tunables_set_defaults(ctdb);
 
 	ret = ctdb_set_transport(ctdb, options.transport);