From: Volker Lendecke <vl@samba.org>
Date: Mon, 1 Jul 2019 13:15:41 +0000 (+0200)
Subject: smbd: Remove unused "msg_ctx" from brl_lock()
X-Git-Tag: ldb-2.0.5~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b809e68c12f35ec1f2d6aac37d2a28706b91be62;p=thirdparty%2Fsamba.git

smbd: Remove unused "msg_ctx" from brl_lock()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 743360a5a19..bd2dfa252db 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -901,16 +901,16 @@ NTSTATUS smb_vfs_call_brl_lock_windows(struct vfs_handle_struct *handle,
  Lock a range of bytes.
 ****************************************************************************/
 
-NTSTATUS brl_lock(struct messaging_context *msg_ctx,
-		struct byte_range_lock *br_lck,
-		uint64_t smblctx,
-		struct server_id pid,
-		br_off start,
-		br_off size,
-		enum brl_type lock_type,
-		enum brl_flavour lock_flav,
-		struct server_id *blocker_pid,
-		uint64_t *psmblctx)
+NTSTATUS brl_lock(
+	struct byte_range_lock *br_lck,
+	uint64_t smblctx,
+	struct server_id pid,
+	br_off start,
+	br_off size,
+	enum brl_type lock_type,
+	enum brl_flavour lock_flav,
+	struct server_id *blocker_pid,
+	uint64_t *psmblctx)
 {
 	NTSTATUS ret;
 	struct lock_struct lock;
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 2f893858699..5b91aa89f26 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -278,7 +278,6 @@ NTSTATUS do_lock(struct messaging_context *msg_ctx,
 	}
 
 	status = brl_lock(
-		msg_ctx,
 		br_lck,
 		smblctx,
 		messaging_server_id(fsp->conn->sconn->msg_ctx),
diff --git a/source3/locking/proto.h b/source3/locking/proto.h
index 7bb21cffc23..0d1d367fbab 100644
--- a/source3/locking/proto.h
+++ b/source3/locking/proto.h
@@ -37,16 +37,16 @@ void brl_set_num_read_oplocks(struct byte_range_lock *brl,
 NTSTATUS brl_lock_windows_default(struct byte_range_lock *br_lck,
 				  struct lock_struct *plock);
 
-NTSTATUS brl_lock(struct messaging_context *msg_ctx,
-		struct byte_range_lock *br_lck,
-		uint64_t smblctx,
-		struct server_id pid,
-		br_off start,
-		br_off size,
-		enum brl_type lock_type,
-		enum brl_flavour lock_flav,
-		struct server_id *blocker_pid,
-		uint64_t *psmblctx);
+NTSTATUS brl_lock(
+	struct byte_range_lock *br_lck,
+	uint64_t smblctx,
+	struct server_id pid,
+	br_off start,
+	br_off size,
+	enum brl_type lock_type,
+	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,
 		uint64_t smblctx,