From a36c666ff114094973bb75b48bf16c07d0080b67 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 8 Jan 2025 12:51:37 +0100 Subject: [PATCH] s3/brlock: remove brl_get_locks_for_locking() BUG: https://bugzilla.samba.org/show_bug.cgi?id=15767 Pair-Programmed-With: Ralph Boehme Signed-off-by: Ralph Boehme Signed-off-by: Stefan Metzmacher (cherry picked from commit 0c4c430c50e15d591a0d871a5f3e59e8be0d0a83) --- source3/locking/brlock.c | 19 ------------------- source3/locking/proto.h | 4 ---- 2 files changed, 23 deletions(-) diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index 0e58339b108..b9decbc9e2a 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -1733,25 +1733,6 @@ struct byte_range_lock *brl_get_locks(TALLOC_CTX *mem_ctx, files_struct *fsp) return br_lck; } -struct byte_range_lock *brl_get_locks_for_locking(TALLOC_CTX *mem_ctx, - files_struct *fsp, - TALLOC_CTX *req_mem_ctx, - const struct GUID *req_guid) -{ - struct byte_range_lock *br_lck = NULL; - - br_lck = brl_get_locks(mem_ctx, fsp); - if (br_lck == NULL) { - return NULL; - } - SMB_ASSERT(req_mem_ctx != NULL); - br_lck->req_mem_ctx = req_mem_ctx; - SMB_ASSERT(req_guid != NULL); - br_lck->req_guid = req_guid; - - return br_lck; -} - struct brl_get_locks_readonly_state { TALLOC_CTX *mem_ctx; struct byte_range_lock **br_lock; diff --git a/source3/locking/proto.h b/source3/locking/proto.h index 967ed7641bf..015aba1b78d 100644 --- a/source3/locking/proto.h +++ b/source3/locking/proto.h @@ -83,10 +83,6 @@ int brl_forall(void (*fn)(struct file_id id, struct server_id pid, br_off start, br_off size, void *private_data), void *private_data); -struct byte_range_lock *brl_get_locks_for_locking(TALLOC_CTX *mem_ctx, - files_struct *fsp, - TALLOC_CTX *req_mem_ctx, - const struct GUID *req_guid); struct share_mode_lock; typedef void (*share_mode_do_locked_brl_fn_t)( struct share_mode_lock *lck, -- 2.47.2