From 9f596c17c7d255213df6201d4d489df1580faef4 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 4 Aug 2014 12:41:06 +0000 Subject: ctdb-locking: TALLOC_FREE copes with NULL Signed-off-by: Volker Lendecke Reviewed-by: Amitay Isaacs --- ctdb/server/ctdb_lock.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ctdb/server/ctdb_lock.c b/ctdb/server/ctdb_lock.c index a403e25573..a7df6cf680 100644 --- a/ctdb/server/ctdb_lock.c +++ b/ctdb/server/ctdb_lock.c @@ -432,9 +432,7 @@ static void ctdb_lock_handler(struct tevent_context *ev, lock_ctx = talloc_get_type_abort(private_data, struct lock_context); /* cancel the timeout event */ - if (lock_ctx->ttimer) { - TALLOC_FREE(lock_ctx->ttimer); - } + TALLOC_FREE(lock_ctx->ttimer); t = timeval_elapsed(&lock_ctx->start_time); id = lock_bucket_id(t); -- cgit