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

smbd: Remove unused "msg_ctx" from do_unlock()

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

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index b2871eba6f5..a31c6f7d3af 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -307,12 +307,11 @@ NTSTATUS do_lock(files_struct *fsp,
  Utility function called by unlocking requests.
 ****************************************************************************/
 
-NTSTATUS do_unlock(struct messaging_context *msg_ctx,
-			files_struct *fsp,
-			uint64_t smblctx,
-			uint64_t count,
-			uint64_t offset,
-			enum brl_flavour lock_flav)
+NTSTATUS do_unlock(files_struct *fsp,
+		   uint64_t smblctx,
+		   uint64_t count,
+		   uint64_t offset,
+		   enum brl_flavour lock_flav)
 {
 	bool ok = False;
 	struct byte_range_lock *br_lck = NULL;
diff --git a/source3/locking/proto.h b/source3/locking/proto.h
index 3f30bcb3164..473cf56a5ed 100644
--- a/source3/locking/proto.h
+++ b/source3/locking/proto.h
@@ -104,12 +104,11 @@ NTSTATUS do_lock(files_struct *fsp,
 		 enum brl_flavour lock_flav,
 		 struct server_id *pblocker_pid,
 		 uint64_t *psmblctx);
-NTSTATUS do_unlock(struct messaging_context *msg_ctx,
-			files_struct *fsp,
-			uint64_t smblctx,
-			uint64_t count,
-			uint64_t offset,
-			enum brl_flavour lock_flav);
+NTSTATUS do_unlock(files_struct *fsp,
+		   uint64_t smblctx,
+		   uint64_t count,
+		   uint64_t offset,
+		   enum brl_flavour lock_flav);
 void locking_close_file(struct messaging_context *msg_ctx,
 			files_struct *fsp,
 			enum file_close_type close_type);
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index a0b8a1e8ea7..982829a5a66 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -85,8 +85,7 @@ NTSTATUS smbd_do_locks_try(
 	 */
 	for (i = i-1; i != UINT16_MAX; i--) {
 		struct smbd_lock_element *e = &locks[i];
-		do_unlock(msg_ctx,
-			  fsp,
+		do_unlock(fsp,
 			  e->smblctx,
 			  e->count,
 			  e->offset,
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 6c32671deb7..d2cc2785adb 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -8202,12 +8202,12 @@ NTSTATUS smbd_do_unlocking(struct smb_request *req,
 			goto done;
 		}
 
-		status = do_unlock(req->sconn->msg_ctx,
-				fsp,
-				e->smblctx,
-				e->count,
-				e->offset,
-				lock_flav);
+		status = do_unlock(
+			fsp,
+			e->smblctx,
+			e->count,
+			e->offset,
+			lock_flav);
 
 		DEBUG(10, ("%s: unlock returned %s\n", __func__,
 			   nt_errstr(status)));