locking: Simplify check for locks on record or database

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
(Imported from commit a890e760bbcb2d0f384aff285d1282de2a42d313)

diff --git a/server/ctdb_lock.c b/server/ctdb_lock.c
index 61e9a5cc432f5e6d04cd6bdb9fc728c00b0381fd..297dbde6258a63ac25fa9c95e54d68c30e99e98b 100644 (file)
--- a/server/ctdb_lock.c
+++ b/server/ctdb_lock.c
@@ -279,13 +279,13 @@ static int ctdb_lock_context_destructor(struct lock_context *lock_ctx)
                        lock_ctx->ctdb_db->lock_num_current--;
                }
                CTDB_DECREMENT_STAT(lock_ctx->ctdb, locks.num_current);
-               if (lock_ctx->type == LOCK_RECORD || lock_ctx->type == LOCK_DB) {
+               if (lock_ctx->ctdb_db) {
                        CTDB_DECREMENT_DB_STAT(lock_ctx->ctdb_db, locks.num_current);
                }
        } else {
                DLIST_REMOVE(lock_ctx->ctdb->lock_pending, lock_ctx);
                CTDB_DECREMENT_STAT(lock_ctx->ctdb, locks.num_pending);
-               if (lock_ctx->type == LOCK_RECORD || lock_ctx->type == LOCK_DB) {
+               if (lock_ctx->ctdb_db) {
                        CTDB_DECREMENT_DB_STAT(lock_ctx->ctdb_db, locks.num_pending);
                }
        }
@@ -491,7 +491,7 @@ static void ctdb_lock_timeout_handler(struct tevent_context *ev,
        lock_ctx = talloc_get_type_abort(private_data, struct lock_context);
        ctdb = lock_ctx->ctdb;
 
-       if (lock_ctx->type == LOCK_RECORD || lock_ctx->type == LOCK_DB) {
+       if (lock_ctx->ctdb_db) {
                DEBUG(DEBUG_WARNING,
                      ("Unable to get %s lock on database %s for %.0lf seconds\n",
                       (lock_ctx->type == LOCK_RECORD ? "RECORD" : "DB"),