From: Volker Lendecke Date: Mon, 1 Jul 2019 13:28:10 +0000 (+0200) Subject: smbd: Remove unused "msg_ctx" from brl_unlock() X-Git-Tag: ldb-2.0.5~50 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c2292a85f54ed46fe9dc0b9126be7b64f2656118;p=thirdparty%2Fsamba.git smbd: Remove unused "msg_ctx" from brl_unlock() Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index e2aa216cf57..c04320d533a 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -1191,8 +1191,7 @@ bool smb_vfs_call_brl_unlock_windows(struct vfs_handle_struct *handle, Unlock a range of bytes. ****************************************************************************/ -bool brl_unlock(struct messaging_context *msg_ctx, - struct byte_range_lock *br_lck, +bool brl_unlock(struct byte_range_lock *br_lck, uint64_t smblctx, struct server_id pid, br_off start, @@ -1388,7 +1387,7 @@ void brl_close_fnum(struct messaging_context *msg_ctx, if (lock->context.tid == tid && serverid_equal(&lock->context.pid, &pid) && (lock->fnum == fnum)) { - brl_unlock(msg_ctx, + brl_unlock( br_lck, lock->context.smblctx, pid, diff --git a/source3/locking/locking.c b/source3/locking/locking.c index b6f937df013..65718f10089 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -337,8 +337,7 @@ NTSTATUS do_unlock(struct messaging_context *msg_ctx, return NT_STATUS_NO_MEMORY; } - ok = brl_unlock(msg_ctx, - br_lck, + ok = brl_unlock(br_lck, smblctx, messaging_server_id(fsp->conn->sconn->msg_ctx), offset, diff --git a/source3/locking/proto.h b/source3/locking/proto.h index 48b5917df5c..111bca2777c 100644 --- a/source3/locking/proto.h +++ b/source3/locking/proto.h @@ -47,8 +47,7 @@ NTSTATUS brl_lock( enum brl_flavour lock_flav, struct server_id *blocker_pid, uint64_t *psmblctx); -bool brl_unlock(struct messaging_context *msg_ctx, - struct byte_range_lock *br_lck, +bool brl_unlock(struct byte_range_lock *br_lck, uint64_t smblctx, struct server_id pid, br_off start,