From 2592ae5a56e813bb7cb68789f93fc281b1822a82 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Mon, 11 Aug 2014 17:10:23 +1000 Subject: ctdb-locking: Remove unused function ctdb_free_lock_request_context There is no need for a special function to free lock request and corresponding lock context. Freeing lock request will free lock context also. Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke --- ctdb/include/ctdb_private.h | 2 -- ctdb/server/ctdb_lock.c | 10 ---------- 2 files changed, 12 deletions(-) diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h index 7de9afbf14..99fc5f8ed6 100644 --- a/ctdb/include/ctdb_private.h +++ b/ctdb/include/ctdb_private.h @@ -1580,8 +1580,6 @@ struct lock_request; int ctdb_lockall_mark_prio(struct ctdb_context *ctdb, uint32_t priority); int ctdb_lockall_unmark_prio(struct ctdb_context *ctdb, uint32_t priority); -void ctdb_lock_free_request_context(struct lock_request *lock_req); - struct lock_request *ctdb_lock_record(TALLOC_CTX *mem_ctx, struct ctdb_db_context *ctdb_db, TDB_DATA key, diff --git a/ctdb/server/ctdb_lock.c b/ctdb/server/ctdb_lock.c index 4a641f19e2..57c27e59c0 100644 --- a/ctdb/server/ctdb_lock.c +++ b/ctdb/server/ctdb_lock.c @@ -316,16 +316,6 @@ static int ctdb_lock_request_destructor(struct lock_request *lock_request) return 0; } -void ctdb_lock_free_request_context(struct lock_request *lock_req) -{ - struct lock_context *lock_ctx; - - lock_ctx = lock_req->lctx; - talloc_free(lock_req); - talloc_free(lock_ctx); -} - - /* * Process all the callbacks waiting for lock * -- cgit