From: Martin Schwenke <martin@meltin.net>
Date: Mon, 30 May 2016 02:18:50 +0000 (+1000)
Subject: ctdb-recoverd: No need to reset reclock handler
X-Git-Tag: tdb-1.3.10~926
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58be187de02d3c24d2666b91990f9cd2a14f0b7f;p=thirdparty%2Fsamba.git

ctdb-recoverd: No need to reset reclock handler

It won't be called more than once by the cluster mutex code.

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

diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index 538d4301adb..91428e2a46b 100644
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -1601,9 +1601,6 @@ static bool ctdb_recovery_lock(struct ctdb_context *ctdb)
 		tevent_loop_once(ctdb->ev);
 	}
 
-	/* Ensure no attempts to access to s after function return */
-	ctdb_cluster_mutex_set_handler(h, hold_reclock_handler, NULL);
-
 	return s.locked;
 }