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

smbd: Remove unused "msg_ctx" from smbd_do_locks_try()

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

diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 982829a5a66..d096cd5e8ef 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -45,7 +45,6 @@ struct timeval timeval_brl_min(const struct timeval *tv1,
 }
 
 NTSTATUS smbd_do_locks_try(
-	struct messaging_context *msg_ctx,
 	struct files_struct *fsp,
 	enum brl_flavour lock_flav,
 	uint16_t num_locks,
@@ -190,7 +189,6 @@ struct tevent_req *smbd_smb1_do_locks_send(
 	}
 
 	status = smbd_do_locks_try(
-		state->msg_ctx,
 		state->fsp,
 		state->lock_flav,
 		state->num_locks,
@@ -364,7 +362,6 @@ static void smbd_smb1_do_locks_retry(struct tevent_req *subreq)
 	}
 
 	status = smbd_do_locks_try(
-		retry_state->msg_ctx,
 		fsp,
 		retry_state->lock_flav,
 		retry_state->num_locks,
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 112acfa4ad4..b0e6f89bd80 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -98,7 +98,6 @@ bool aio_add_req_to_fsp(files_struct *fsp, struct tevent_req *req);
 struct timeval timeval_brl_min(const struct timeval *tv1,
 			const struct timeval *tv2);
 NTSTATUS smbd_do_locks_try(
-	struct messaging_context *msg_ctx,
 	struct files_struct *fsp,
 	enum brl_flavour lock_flav,
 	uint16_t num_locks,
diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index 7d983cc3456..36ec36301b1 100644
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -369,7 +369,6 @@ static struct tevent_req *smbd_smb2_lock_send(TALLOC_CTX *mem_ctx,
 	}
 
 	status = smbd_do_locks_try(
-		state->smb1req->sconn->msg_ctx,
 		state->fsp,
 		WINDOWS_LOCK,
 		state->lock_count,
@@ -436,7 +435,6 @@ static void smbd_smb2_lock_retry(struct tevent_req *subreq)
 	}
 
 	status = smbd_do_locks_try(
-		state->smb1req->sconn->msg_ctx,
 		state->fsp,
 		WINDOWS_LOCK,
 		state->lock_count,