From da9bb48a459644801deac2514fc00c9c639c2ef5 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Tue, 11 Sep 2018 15:05:19 +1000 Subject: ctdb-recoverd: Return early when the recovery lock is not held This makes upcoming changes simpler. Update to modern debug macro while touching relevant line. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13617 Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs (cherry picked from commit a755d060c13b65dfb6d73979aaf111c489882bfb) --- ctdb/server/ctdb_recoverd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'ctdb') diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index 3df319bb022..33df06f2720 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -974,10 +974,12 @@ static bool ctdb_recovery_lock(struct ctdb_recoverd *rec) static void ctdb_recovery_unlock(struct ctdb_recoverd *rec) { - if (rec->recovery_lock_handle != NULL) { - DEBUG(DEBUG_NOTICE, ("Releasing recovery lock\n")); - TALLOC_FREE(rec->recovery_lock_handle); + if (rec->recovery_lock_handle == NULL) { + return; } + + D_NOTICE("Releasing recovery lock\n"); + TALLOC_FREE(rec->recovery_lock_handle); } static void ban_misbehaving_nodes(struct ctdb_recoverd *rec, bool *self_ban) -- cgit v1.2.1