From d1f996a50f1da36e7046fe28cdb97285e7cf00a5 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Tue, 27 Oct 2015 14:32:48 +1100 Subject: [PATCH] ctdb-recoverd: Drop explicit check for recovery lock This is already handled in update_recovery_lock(), which is called immediately before. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/server/ctdb_recoverd.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index d131c47fd7c..9ff73bdb2f5 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -3388,13 +3388,6 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec, return; } - /* Make sure that if recovery lock verification becomes disabled when - we close the file - */ - if (ctdb->recovery_lock_file == NULL) { - ctdb_recovery_unlock(ctdb); - } - pnn = ctdb_get_pnn(ctdb); /* get the vnnmap */ -- 2.34.1